From: moodler <moodler>
Date: Mon, 3 Jan 2005 15:27:32 +0000 (+0000)
Subject: Fixed some bugs in my last checkin
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=973cda9d962cf5f576244f9b6baecb867cc4a724;p=moodle.git

Fixed some bugs in my last checkin
---

diff --git a/message/lib.php b/message/lib.php
index 7745c55f1d..b83324dfcd 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -548,23 +548,23 @@ function message_contact_link($userid, $linktype='add', $return=false, $script="
 
     switch ($linktype) {
         case 'block':
-            $output = '<a target="message" href="'.$script.'&amp;blockcontact='.$userid.
+            $output = '<a href="'.$script.'&amp;blockcontact='.$userid.
                    '&amp;sesskey='.$USER->sesskey.'" title="'.$str->blockcontact.'">'.
                    '<img src="'.$CFG->pixpath.'/t/go.gif" height="11" width="11" border="0"></a>';
             break;
         case 'unblock':
-            $output = '<a target="message" href="'.$script.'&amp;unblockcontact='.$userid.
+            $output = '<a href="'.$script.'&amp;unblockcontact='.$userid.
                    '&amp;sesskey='.$USER->sesskey.'" title="'.$str->unblockcontact.'">'.
                    '<img src="'.$CFG->pixpath.'/t/stop.gif" height="11" width="11" border="0"></a>';
             break;
         case 'remove':
-            $output = '<a target="message" href="'.$script.'&amp;removecontact='.$userid.
+            $output = '<a href="'.$script.'&amp;removecontact='.$userid.
                    '&amp;sesskey='.$USER->sesskey.'" title="'.$str->removecontact.'">'.
                    '<img src="'.$CFG->pixpath.'/t/user.gif" height="11" width="11" border="0"></a>';
             break;
         case 'add':
         default:
-            $output = '<a target="message" href="'.$script.'&amp;addcontact='.$userid.
+            $output = '<a href="'.$script.'&amp;addcontact='.$userid.
                    '&amp;sesskey='.$USER->sesskey.'" title="'.$str->addcontact.'">'.
                    '<img src="'.$CFG->pixpath.'/t/usernot.gif" height="11" width="11" border="0"></a>';
 
diff --git a/message/user.php b/message/user.php
index 8b91c24699..bf0517ebda 100644
--- a/message/user.php
+++ b/message/user.php
@@ -88,15 +88,21 @@
             echo '<div class="message_users">';
             if ($contact = get_record('message_contacts', 'userid', $USER->id, 'contactid', $user->id)) {
                  if ($contact->blocked) {
-                     message_contact_link($user->id, 'add', false, 'user.php?frame=info'); echo "&nbsp;";
-                     message_contact_link($user->id, 'unblock', false, 'user.php?frame=info'); echo "&nbsp;";
+                     message_contact_link($user->id, 'add', false, 'user.php?id='.$user->id.'&amp;frame=info'); 
+                     echo "&nbsp;";
+                     message_contact_link($user->id, 'unblock', false, 'user.php?id='.$user->id.'&amp;frame=info'); 
+                     echo "&nbsp;";
                  } else {
-                     message_contact_link($user->id, 'remove', false, 'user.php?frame=info'); echo "&nbsp;";
-                     message_contact_link($user->id, 'block', false, 'user.php?frame=info'); echo "&nbsp;";
+                     message_contact_link($user->id, 'remove', false, 'user.php?id='.$user->id.'&amp;frame=info'); 
+                     echo "&nbsp;";
+                     message_contact_link($user->id, 'block', false, 'user.php?id='.$user->id.'&amp;frame=info'); 
+                     echo "&nbsp;";
                  }
             } else {
-                 message_contact_link($user->id, 'add', false, 'user.php?frame=info'); echo "&nbsp;";
-                 message_contact_link($user->id, 'block', false, 'user.php?frame=info'); echo "&nbsp;";
+                 message_contact_link($user->id, 'add', false, 'user.php?id='.$user->id.'&amp;frame=info'); 
+                 echo "&nbsp;";
+                 message_contact_link($user->id, 'block', false, 'user.php?id='.$user->id.'&amp;frame=info'); 
+                 echo "&nbsp;";
             }
             message_history_link($user->id, 0, false, '', '', 'icon');
             echo '</div>';