Revert "issue 195: fix SQL for checking recent logins"

This reverts commit 96c2e42.
Pushed in error. Should be a in a pull request.

Author: picnicpete

cli/clean.php

@@ -15,8 +15,6 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * CLI script to perform a data wash.
- *
  * @package    local_datacleaner
  * @copyright  2015 Brendan Heywood <[email protected]>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -30,7 +28,7 @@
 
 // Now get cli options.
 list($options, $unrecognized) = cli_get_params(
-    [
+    array(
         'help' => false,
         'force' => false,
         'filter' => false,
@@ -40,11 +38,11 @@
         'dryrun' => false,
         'verbose' => false,
         'reset' => false,
-    ],
-    [
+    ),
+    array(
         'h' => 'help',
         'v' => 'verbose',
-    ]
+    )
 );
 
 if ($unrecognized) {

cli/lib.php

@@ -15,19 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Library functions for data cleaner.
- *
- * @package    local_datacleaner
+ * @package    cleaner
  * @copyright  2015 Catalyst IT
  * @author     Nigel Cunningham <[email protected]>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-<<<<<<< HEAD
 defined('MOODLE_INTERNAL') || die();
-=======
-use local_datacleaner\clean;
->>>>>>> ce6bb45 (issue 195: coding style fixes)
 
 /**
  * Print a message to the terminal.
@@ -95,33 +89,43 @@ function safety_checks($dryrun) {
     $minutes = $timetoshowusers / 60;
     $now = time();
     $timefrom = $now - $timetoshowusers; // Unlike original code, don't care about caches for this.
-    $params = ['timefrom' => $timefrom];
-
-    $namefields = "u." . implode(', u.', \core_user\fields::get_name_fields());
-
-    $sql = "SELECT u.id, u.username, {$namefields}
-              FROM {user} u
-             WHERE u.lastaccess > :timefrom
-               AND u.deleted = 0
-             ORDER BY lastaccess DESC ";
-    $users = $DB->get_records_sql($sql, $params);
-
-    $message = "The following users have logged in within the last {$minutes} minutes:\n";
-    $nonadmins = 0;
-    foreach ($users as $user) {
-        $message .= ' - ' . fullname($user) . ' (' . $user->username . ')';
-        if (is_siteadmin($user)) {
-            $message .= ' (siteadmin)';
-        } else {
-            $nonadmins++;
+    $params = array('now' => $now, 'timefrom' => $timefrom);
+
+    $csql = "SELECT COUNT(u.id)
+               FROM {user} u
+              WHERE u.lastaccess > :timefrom
+                AND u.lastaccess <= :now
+                AND u.deleted = 0";
+
+    if ($DB->count_records_sql($csql, $params)) {
+        $namefields = "u." . implode(', u.', get_all_user_name_fields());
+
+        $sql = "SELECT u.id, u.username, {$namefields}
+                  FROM {user} u
+                 WHERE u.lastaccess > :timefrom
+                   AND u.lastaccess <= :now
+                   AND u.deleted = 0
+              GROUP BY u.id
+              ORDER BY lastaccess DESC ";
+        $users = $DB->get_records_sql($sql, $params);
+
+        $message = "The following users have logged in within the last {$minutes} minutes:\n";
+        $nonadmins = 0;
+        foreach ($users as $user) {
+            $message .= ' - ' . fullname($user) . ' (' . $user->username . ')';
+            if (is_siteadmin($user)) {
+                $message .= ' (siteadmin)';
+            } else {
+                $nonadmins++;
+            }
+            $message .= "\n";
         }
-        $message .= "\n";
-    }
 
-    if ($nonadmins) {
-        abort_message($abort, $message);
-        abort_message($abort, "There are non site-administrators in the list of recent users.", true);
-        $willdie = true;
+        if ($nonadmins) {
+            abort_message($abort, $message);
+            abort_message("There are non site-administrators in the list of recent users.", true);
+            $willdie = true;
+        }
     }
 
     // 3. Has cron run recently?