Merge branch 'MDL-25616_recent_messages' of git://github.com/andyjdavis/moodle

Conflicts fixed:
	message/index.php
	message/lib.php

admin/user/user_bulk_message.php

@@ -30,7 +30,7 @@ if ($confirm and !empty($msg) and confirm_sesskey()) {
         //TODO we should probably support all text formats here or only FORMAT_MOODLE
         //For now bulk messaging is still using the html editor and its supplying html
         //so we have to use html format for it to be displayed correctly
-        message_post_message($USER, $user, $msg, FORMAT_HTML, 'direct');
+        message_post_message($USER, $user, $msg, FORMAT_HTML);
     }
     $rs->close();
     redirect($return);

lang/en/message.php

@@ -65,6 +65,8 @@ $string['loggedoff'] = 'Not online';
 $string['loggedoffdescription'] = 'When I\'m offline';
 $string['managecontacts'] = 'Manage my contacts';
 $string['mostrecent'] = 'Recent messages';
+$string['mostrecentconversations'] = 'Recent conversations';
+$string['mostrecentnotifications'] = 'Recent notifications';
 $string['mailsent'] = 'Your message was sent via email.';
 $string['maxmessages'] = 'Maximum number of messages to show in the discussion history';
 $string['message'] = 'Message';
@@ -93,6 +95,7 @@ $string['private_config'] = 'Popup message window';
 $string['processortag'] = 'Destination';
 $string['providers_config'] = 'Configure notification methods for incoming messages';
 $string['providerstag'] = 'Source';
+$string['recent'] = 'Recent';
 $string['readmessages'] = '{$a} read messages';
 $string['removecontact'] = 'Remove contact';
 $string['savemysettings'] = 'Save my settings';

message/index.php

@@ -37,7 +37,10 @@ if (empty($CFG->messaging)) {
     print_error('disabled', 'message');
 }
 
+//VIEW_PARAM is the preferred URL parameter but we'll still accept usergroup in case its referenced externally
 $usergroup = optional_param('usergroup', VIEW_UNREAD_MESSAGES, PARAM_ALPHANUMEXT);
+$viewing = optional_param(VIEW_PARAM, $usergroup, PARAM_ALPHANUMEXT);
+
 $history   = optional_param('history', MESSAGE_HISTORY_SHORT, PARAM_INT);
 $search    = optional_param('search', '', PARAM_CLEAN); //TODO: use PARAM_RAW, but make sure we use s() and p() properly
 
@@ -68,13 +71,15 @@ if ($user2id !== 0) {
     $url->param('id', $user2id);
 }
 
-if ($usergroup !== 0) {
-    if ($user2id !== 0 && $usergroup==VIEW_SEARCH) {
-        //if theyve searched and selected a user change the view back to contacts so the search button is displayed
-        $usergroup = VIEW_CONTACTS;
+if ($user2id !== 0) {
+    //Switch view back to contacts if:
+    //1) theyve searched and selected a user
+    //2) they've viewed recent messages or notifications and clicked through to a user
+    if ($viewing == VIEW_SEARCH || $viewing == VIEW_SEARCH || $viewing == VIEW_RECENT_NOTIFICATIONS) {
+        $viewing = VIEW_CONTACTS;
     }
-    $url->param('usergroup', $usergroup);
 }
+$url->param('viewing', $viewing);
 
 $PAGE->set_url($url);
 
@@ -87,8 +92,8 @@ $context = get_context_instance(CONTEXT_SYSTEM);
 $user1 = null;
 $currentuser = true;
 $showcontactactionlinks = SHOW_ACTION_LINKS_IN_CONTACT_LIST;
-if ($user1id!=$USER->id) {
-    $user1 = $DB->get_record('user', array('id'=>$user1id));
+if ($user1id != $USER->id) {
+    $user1 = $DB->get_record('user', array('id' => $user1id));
     if (!$user1) {
         print_error('invaliduserid');
     }
@@ -101,7 +106,7 @@ unset($user1id);
 
 $user2 = null;
 if (!empty($user2id)) {
-    $user2 = $DB->get_record("user", array("id"=>$user2id));
+    $user2 = $DB->get_record("user", array("id" => $user2id));
     if (!$user2) {
         print_error('invaliduserid');
     }
@@ -109,7 +114,7 @@ if (!empty($user2id)) {
 unset($user2id);
 
 //the current user isnt involved in this discussion at all
-if ($user1->id!=$USER->id && $user2->id!=$USER->id && !has_capability('moodle/site:readallmessages', $context)) {
+if ($user1->id != $USER->id && (!empty($user2) && $user2->id != $USER->id) && !has_capability('moodle/site:readallmessages', $context)) {
     print_error('accessdenied','admin');
 }
 
@@ -117,7 +122,7 @@ if ($user1->id!=$USER->id && $user2->id!=$USER->id && !has_capability('moodle/si
 if ($addcontact and confirm_sesskey()) {
     add_to_log(SITEID, 'message', 'add contact', 'index.php?user1='.$addcontact.'&user2='.$USER->id, $addcontact);
     message_add_contact($addcontact);
-    redirect($CFG->wwwroot . '/message/index.php?usergroup=contacts&id='.$addcontact);
+    redirect($CFG->wwwroot . '/message/index.php?'.VIEW_PARAM.'=contacts&id='.$addcontact);
 }
 if ($removecontact and confirm_sesskey()) {
     add_to_log(SITEID, 'message', 'remove contact', 'index.php?user1='.$removecontact.'&user2='.$USER->id, $removecontact);
@@ -137,7 +142,7 @@ $messageerror = null;
 if ($currentuser && !empty($user2) && has_capability('moodle/site:sendmessage', $context)) {
 
     // Check that the user is not blocking us!!
-    if ($contact = $DB->get_record('message_contacts', array('userid'=>$user2->id, 'contactid'=>$user1->id))) {
+    if ($contact = $DB->get_record('message_contacts', array('userid' => $user2->id, 'contactid' => $user1->id))) {
         if ($contact->blocked and !has_capability('moodle/site:readallmessages', $context)) {
             $messageerror = get_string('userisblockingyou', 'message');
         }
@@ -163,12 +168,12 @@ if ($currentuser && !empty($user2) && has_capability('moodle/site:sendmessage',
                 print_error('invalidsesskey');
             }
 
-            $messageid = message_post_message($user1, $user2, $data->message, FORMAT_MOODLE, 'direct');
+            $messageid = message_post_message($user1, $user2, $data->message, FORMAT_MOODLE);
             if (!empty($messageid)) {
                 //including the id of the user sending the message in the logged URL so the URL works for admins
                 //note message ID may be misleading as the message may potentially get a different ID when moved from message to message_read
                 add_to_log(SITEID, 'message', 'write', 'index.php?user='.$user1->id.'&id='.$user2->id.'&history=1#m'.$messageid, $user1->id);
-                redirect($CFG->wwwroot . '/message/index.php?usergroup='.$usergroup.'&id='.$user2->id);
+                redirect($CFG->wwwroot . '/message/index.php?'.VIEW_PARAM.'='.$viewing.'&id='.$user2->id);
             }
         }
     }
@@ -201,16 +206,16 @@ if (!empty($user2)) {
     if ($countunread>0) {
         //mark the messages we're going to display as read
         message_mark_messages_read($user1->id, $user2->id);
-         if($usergroup==VIEW_UNREAD_MESSAGES) {
+         if($viewing == VIEW_UNREAD_MESSAGES) {
              $viewingnewmessages = true;
          }
     }
 }
 $countunreadtotal = message_count_unread_messages($user1);
 
-if ($countunreadtotal==0 && $usergroup==VIEW_UNREAD_MESSAGES && empty($user2)) {
+if ($countunreadtotal == 0 && $viewing == VIEW_UNREAD_MESSAGES && empty($user2)) {
     //default to showing the search
-    $usergroup = VIEW_SEARCH;
+    $viewing = VIEW_SEARCH;
 }
 
 $blockedusers = message_get_blocked_users($user1, $user2);
@@ -218,18 +223,18 @@ $countblocked = count($blockedusers);
 
 list($onlinecontacts, $offlinecontacts, $strangers) = message_get_contacts($user1, $user2);
 
-message_print_contact_selector($countunreadtotal, $usergroup, $user1, $user2, $blockedusers, $onlinecontacts, $offlinecontacts, $strangers, $showcontactactionlinks, $page);
+message_print_contact_selector($countunreadtotal, $viewing, $user1, $user2, $blockedusers, $onlinecontacts, $offlinecontacts, $strangers, $showcontactactionlinks, $page);
 
-echo html_writer::start_tag('div', array('class'=>'messagearea mdl-align'));
+echo html_writer::start_tag('div', array('class' => 'messagearea mdl-align'));
     if (!empty($user2)) {
 
-        echo html_writer::start_tag('div', array('class'=>'mdl-left messagehistory'));
+        echo html_writer::start_tag('div', array('class' => 'mdl-left messagehistory'));
 
             $visible = 'visible';
             $hidden = 'hiddenelement'; //cant just use hidden as mform adds that class to its fieldset for something else
 
             $recentlinkclass = $recentlabelclass = $historylinkclass = $historylabelclass = $visible;
-            if ($history==MESSAGE_HISTORY_ALL) {
+            if ($history == MESSAGE_HISTORY_ALL) {
                 $displaycount = 0;
 
                 $recentlabelclass = $historylinkclass = $hidden;
@@ -249,25 +254,25 @@ echo html_writer::start_tag('div', array('class'=>'messagearea mdl-align'));
                 $recentlinkclass = $historylabelclass = $hidden;
             }
 
-            $messagehistorylink =  html_writer::start_tag('div', array('class'=>'mdl-align messagehistorytype'));
+            $messagehistorylink =  html_writer::start_tag('div', array('class' => 'mdl-align messagehistorytype'));
                 $messagehistorylink .= html_writer::link($PAGE->url->out(false).'&history='.MESSAGE_HISTORY_ALL,
                     get_string('messagehistoryfull','message'),
-                    array('class'=>$historylinkclass));
+                    array('class' => $historylinkclass));
 
-                $messagehistorylink .=  html_writer::start_tag('span', array('class'=>$historylabelclass));
+                $messagehistorylink .=  html_writer::start_tag('span', array('class' => $historylabelclass));
                     $messagehistorylink .= get_string('messagehistoryfull','message');
                 $messagehistorylink .= html_writer::end_tag('span');
 
                 $messagehistorylink .= ' | '.html_writer::link($PAGE->url->out(false).'&history='.MESSAGE_HISTORY_SHORT,
                     get_string('mostrecent','message'),
-                    array('class'=>$recentlinkclass));
+                    array('class' => $recentlinkclass));
 
-                $messagehistorylink .=  html_writer::start_tag('span', array('class'=>$recentlabelclass));
+                $messagehistorylink .=  html_writer::start_tag('span', array('class' => $recentlabelclass));
                     $messagehistorylink .= get_string('mostrecent','message');
                 $messagehistorylink .= html_writer::end_tag('span');
 
                 if ($viewingnewmessages) {
-                    $messagehistorylink .=  ' | '.html_writer::start_tag('span');//, array('class'=>$historyclass)
+                    $messagehistorylink .=  ' | '.html_writer::start_tag('span');//, array('class' => $historyclass)
                         $messagehistorylink .= get_string('unreadnewmessages','message',$displaycount);
                     $messagehistorylink .= html_writer::end_tag('span');
                 }
@@ -279,7 +284,7 @@ echo html_writer::start_tag('div', array('class'=>'messagearea mdl-align'));
 
         //send message form
         if ($currentuser && has_capability('moodle/site:sendmessage', $context)) {
-            echo html_writer::start_tag('div', array('class'=>'mdl-align messagesend'));
+            echo html_writer::start_tag('div', array('class' => 'mdl-align messagesend'));
                 if (!empty($messageerror)) {
                     echo $OUTPUT->heading($messageerror, 3);
                 } else {
@@ -293,8 +298,12 @@ echo html_writer::start_tag('div', array('class'=>'messagearea mdl-align'));
                 }
             echo html_writer::end_tag('div');
         }
-    } else if ($usergroup==VIEW_SEARCH) {
+    } else if ($viewing == VIEW_SEARCH) {
         message_print_search($advancedsearch, $user1);
+    } else if ($viewing == VIEW_RECENT_CONVERSATIONS) {
+        message_print_recent_conversations($user1);
+    } else if ($viewing == VIEW_RECENT_NOTIFICATIONS) {
+        message_print_recent_notifications($user1);
     }
 echo html_writer::end_tag('div');
 

theme/base/style/message.css

@@ -47,6 +47,11 @@ table.message .searchresults td {padding:5px;}
 .message .messagearea .messagesend .messagesendbox {width:100%}
 .message .messagearea .messagesend fieldset {padding:0px;margin:0;} /** bring the message send button closer to the message box */
 
+.message .messagearea .messagerecent {text-align:left;width:100%;}
+.message .messagearea .messagerecent .singlemessage {border-bottom:1px solid #D3D3D3;padding:10px;}
+.message .messagearea .messagerecent .singlemessage .otheruser span {padding:5px;}
+.message .messagearea .messagerecent .singlemessage .messagedate {float:right;}
+
 .message .hiddenelement  {display:none;} /** not just using hidden as mform adds that class to its fieldset */
 .message .visible {display:inline;}
 

user/messageselect.php

@@ -142,7 +142,7 @@ if (!empty($messagebody) && !$edit && !$deluser && ($preview || $send)) {
         } else if (!empty($send)) {
             $good = 1;
             foreach ($SESSION->emailto[$id] as $user) {
-                $good = $good && message_post_message($USER,$user,$messagebody,$format,'direct');
+                $good = $good && message_post_message($USER,$user,$messagebody,$format);
             }
             if (!empty($good)) {
                 echo $OUTPUT->heading(get_string('messagedselectedusers'));