From: moodler <moodler>
Date: Mon, 3 Jan 2005 17:05:30 +0000 (+0000)
Subject: History links with context now scroll directly to the message, not
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=2973ec1879e1448dc3cf01a64a97d31ae1ba4b55;p=moodle.git

History links with context now scroll directly to the message, not
just the day.

Must go to bed.  :-)
---

diff --git a/message/lib.php b/message/lib.php
index 1df88f8165..88800826ee 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -478,7 +478,7 @@ function message_print_search_results($frm) {
                 echo '<td class="message_summary">'.message_get_fragment($message->message, $keywords);
                 echo '<br /><div class="message_summary_link">';
                 message_history_link($message->useridto, $message->useridfrom, false, 
-                                     $keywordstring, $datestring, $strcontext);
+                                     $keywordstring, 'm'.$message->id, $strcontext);
                 echo '</div>';
                 echo '</td>';
                 echo '<td class="message_date">'.userdate($message->timecreated, $dateformat).'</td>';
@@ -913,7 +913,7 @@ function message_format_message(&$message, &$user, $format='', $keywords='') {
     if ($keywords) {
         $messagetext = highlight($keywords, $messagetext);
     }
-    return '<p><font size="-1"><strong>'.s($user->firstname).'</strong> ['.$time.']: '.
+    return '<p><a name="m'.$message->id.'"></a><font size="-1"><strong>'.s($user->firstname).'</strong> ['.$time.']: '.
             $messagetext.'</font></p>';
 }
 
@@ -935,7 +935,7 @@ function message_post_message($userfrom, $userto, $message, $format, $messagetyp
     $savemessage->timecreated   = time();
     $savemessage->messagetype   = 'direct';
 
-    if (!insert_record('message', $savemessage)) {
+    if (!$savemessage->id = insert_record('message', $savemessage)) {
         return false;
     }
 
@@ -967,7 +967,7 @@ function message_post_message($userfrom, $userto, $message, $format, $messagetyp
         }
     }
 
-    return true;
+    return $savemessage->id;
 }
 
 ?>
diff --git a/message/search.html b/message/search.html
index afbea697d1..033b90f152 100644
--- a/message/search.html
+++ b/message/search.html
@@ -10,7 +10,7 @@
     </tr>
     <tr>
         <td align="right"><?php print_string('name') ?>:</td>
-        <td><input type="text" name="name" size="20" alt="<?php print_string('name')?>" /></td>
+        <td><input type="text" name="name" size="16" alt="<?php print_string('name')?>" /></td>
         <td><input type="submit" name="personsubmit" value="<?php print_string('search') ?>" /></td>
     </tr>
     <tr>
@@ -28,7 +28,7 @@
     </tr>
     <tr>
         <td align="right"><?php print_string('keywords', 'message') ?>:</td>
-        <td><input type="text" name="keywords" size="20" alt="<?php print_string('keywords', 'message')?>" /></td>
+        <td><input type="text" name="keywords" size="16" alt="<?php print_string('keywords', 'message')?>" /></td>
         <td><input type="submit" name="keywordssubmit" value="<?php print_string('search') ?>" /></td>
     </tr>
     
diff --git a/message/user.php b/message/user.php
index 13e0cb490e..144bb4a9e5 100644
--- a/message/user.php
+++ b/message/user.php
@@ -198,7 +198,7 @@
             if ($message and confirm_sesskey()) {   /// Current user has just sent a message
 
             /// Save it to the database...
-                message_post_message($USER, $user, $message, $format, 'direct');
+                $messageid = message_post_message($USER, $user, $message, $format, 'direct');
 
             /// Format the message as HTML
                 $options = NULL;
@@ -220,7 +220,7 @@
                 $date = usergetdate($message->timecreated);
                 $datestring = $date['year'].$date['mon'].$date['mday'];
 
-                add_to_log(SITEID, 'message', 'write', 'history.php?user1='.$user->id.'&amp;user2='.$USER->id.'#'.$datestring, $user->id);
+                add_to_log(SITEID, 'message', 'write', 'history.php?user1='.$user->id.'&amp;user2='.$USER->id.'#m'.$messageid, $user->id);
             } else {
                 $script  = '';
             }