More mtrace statements

diff --git a/lib/datalib.php b/lib/datalib.php
index 75be8e199ed8b22ecb28ca1ba245bf4d8589bcfc..0e7f340d343d38c63acdbfabf1004eee0d69668a 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1139,7 +1139,7 @@ function get_recent_enrolments($courseid, $timestart) {
 * @param    type description
 */
 function get_course_students($courseid, $sort="s.timeaccess", $dir="", $page=0, $recordsperpage=99999,
-                             $firstinitial="", $lastinitial="", $group=NULL, $search="") {
+                             $firstinitial="", $lastinitial="", $group=NULL, $search="", $fields='') {
 
     global $CFG;
 
@@ -1173,6 +1173,13 @@ function get_course_students($courseid, $sort="s.timeaccess", $dir="", $page=0,
     $groupmembers = '';
     $select = "s.course = '$courseid' AND s.userid = u.id AND u.deleted = '0' ";
 
+    if (!$fields) {
+        $fields = 'u.id, u.confirmed, u.username, u.firstname, u.lastname, '.
+                  'u.maildisplay, u.mailformat, u.maildigest, u.email, u.city, '.
+                  'u.country, u.picture, u.idnumber, u.department, u.institution, '.
+                  'u.emailstop, u.lang, u.timezone, s.timeaccess as lastaccess';
+    }
+
     if ($search) {
         $search = " AND ($fullname $LIKE '%$search%' OR email $LIKE '%$search%') ";
     }
@@ -1197,9 +1204,7 @@ function get_course_students($courseid, $sort="s.timeaccess", $dir="", $page=0,
         $sort = " ORDER BY $sort ";
     }
 
-    return get_records_sql("SELECT u.id, u.confirmed, u.username, u.firstname, u.lastname, u.maildisplay, u.mailformat,
-                            u.maildigest, u.email, u.city, u.country, u.picture, u.idnumber, u.department, u.institution,
-                            u.emailstop, u.lang, u.timezone, s.timeaccess as lastaccess
+    return get_records_sql("SELECT $fields
                             FROM {$CFG->prefix}user u,
                                  {$CFG->prefix}user_students s
                                  $groupmembers
@@ -1377,9 +1382,14 @@ function get_site_users($sort="u.lastaccess DESC", $select="") {
 * @param    boolean $confirmed  a switch to allow/disallow unconfirmed users
 * @param    array(int)  $exceptions a list of IDs to ignore, eg 2,4,5,8,9,10
 * @param    string  $sort   a SQL snippet for the sorting criteria to use
+* @param    string  $firstinitial
+* @param    string  $lastinitial
+* @param    string  $page
+* @param    string  $recordsperpage
+* @param    string  $fields a comma separated list of fields
 */
 function get_users($get=true, $search="", $confirmed=false, $exceptions="", $sort="firstname ASC",
-                   $firstinitial="", $lastinitial="", $page=0, $recordsperpage=99999) {
+                   $firstinitial="", $lastinitial="", $page=0, $recordsperpage=99999, $fields="*") {
 
     global $CFG;
 
@@ -1428,7 +1438,7 @@ function get_users($get=true, $search="", $confirmed=false, $exceptions="", $sor
     }
 
     if ($get) {
-        return get_records_select("user", "$select $sort $limit");
+        return get_records_select("user", "$select $sort $limit", '', $fields);
     } else {
         return count_records_select("user", "$select $sort $limit");
     }

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 302acd3c8e1bec8b896390c65a12797cbb54091f..59ba1496f33fe9b2d10fcce74fdeecf912a64662 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2555,7 +2555,7 @@ function notify_login_failures() {
             }
             $message .= "\n\n".get_string('notifyloginfailuresmessageend','',$CFG->wwwroot)."\n\n";
             foreach ($recip as $admin) {
-                echo "Emailing $admin->username about ".count($logs)." failed login attempts\n";
+                mtrace("Emailing $admin->username about ".count($logs)." failed login attempts");
                 email_to_user($admin,get_admin(),$subject,$message);
             }
             $conf->name = "lastnotifyfailure";
@@ -2563,11 +2563,11 @@ function notify_login_failures() {
             if ($current = get_record("config", "name", "lastnotifyfailure")) {
                 $conf->id = $current->id;
                 if (! update_record("config", $conf)) {
-                    echo "Could not update last notify time";
+                    mtrace("Could not update last notify time");
                 }
 
             } else if (! insert_record("config", $conf)) {
-                echo "Could not set last notify time";
+                mtrace("Could not set last notify time");
             }
         }
     }