Difference Report - 6/16/2011, 9:09 AM
================================================================================

File 1: "A:\htdocs\moodle\message\lib_old.php"
        Last modified on 6/14/2011, 2:06 PM
File 2: "A:\htdocs\moodle\message\lib.php"
        Last modified on 6/16/2011, 8:58 AM

================================================================================
Lines modified at 952
================================================================================
-     global $USER, $DB, $OUTPUT;
+     global $CFG, $USER, $DB, $OUTPUT;
-         if (optional_param('mycourses', 0, PARAM_BOOL)) {
+         if (!empty($CFG->forcecourseonlymessage) or optional_param('mycourses', 0, PARAM_BOOL)) {
-                 if (is_array($susers = message_search_users($mycourse->id, $personsearchstring))) {
+                 if (is_array($susers = message_search_users($mycourse->id, $personsearchstring,null,null,true))) {
-                     foreach ($susers as $suser) $users[$suser->id] = $suser;
+                     foreach ($susers as $suser){
================================================================================
Lines added at 978
================================================================================
+                         if ((is_siteadmin($USER) || enrol_sharing_course($USER, $suser)) && (has_capability('moodle/site:unrestrictedmessages', get_context_instance(CONTEXT_SYSTEM),$USER->id) || has_capability('moodle/site:unrestrictedmessages', get_context_instance(CONTEXT_SYSTEM),$suser->id))){
+                             $users[$suser->id] = $suser;
+                         }
+                     } 
================================================================================
Lines modified at 1407
================================================================================
- function message_search_users($courseid, $searchtext, $sort='', $exceptions='') {
+ function message_search_users($courseid, $searchtext, $sort='', $exceptions='', $courseonly='') {
================================================================================
Lines added at 1408
================================================================================
+ 
+         if(!empty($CFG->forcecourseonlymessage)){ return false; }
================================================================================
Lines modified at 1434
================================================================================
-                                      $order", $params);
+                                      $order LIMIT 200", $params);
-         $contextlists = get_related_contexts_string($context);
+         if(empty($courseonly)){
================================================================================
Lines added at 1439
================================================================================
+             $contextlists = get_related_contexts_string($context);    
+         }else{
+             $contextlists = "IN($context->id)";
+         }
================================================================================
Lines modified at 1447
================================================================================
-                                         WHERE u.deleted = '0' AND u.confirmed = '1'
+                                         WHERE u.deleted = '0' AND u.confirmed = '1' AND u.id != $USER->id
-                                        $order", $params);
+                                        $order LIMIT 200", $params);