From f282e6314ca5a00efaee0e8b0a0abc172c4a3f14 Mon Sep 17 00:00:00 2001
From: martin <martin>
Date: Mon, 5 Aug 2002 08:40:00 +0000
Subject: [PATCH] Cron tidy-ups

---
 admin/cron.php      | 21 ++++++++++++++-------
 mod/journal/lib.php |  2 --
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/admin/cron.php b/admin/cron.php
index 0214afd1a2..fe9157a842 100644
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -41,12 +41,15 @@
 
     // Unsubscribe users who haven't logged in for $CFG->longtimenosee
 
-    if ($CFG->longtimenosee) {
+    if ($CFG->longtimenosee) { // value in days
         $cutofftime = time() - ($CFG->longtimenosee * 3600 * 24);
-        if ($users = get_records_sql("SELECT * FROM user WHERE lastaccess > 0 AND lastaccess < '$cutofftime'")) {
+        if ($users = get_records_sql("SELECT * FROM user 
+                                       WHERE lastaccess > '0' AND 
+                                             lastaccess < '$cutofftime'")) {
             foreach ($users as $user) {
-                delete_records("user_students", "user", $user->id);
-                echo "Deleted student enrolment for $user->firsname $user->lastname ($user->id)\n";
+                if (delete_records("user_students", "user", $user->id)) {
+                    echo "Deleted student enrolment for $user->firstname $user->lastname ($user->id)\n";
+                }
             }
         }
     }
@@ -54,10 +57,14 @@
     // Delete users who haven't confirmed within seven days
 
     $cutofftime = time() - (7 * 24 * 3600);
-    if ($users = get_records_sql("SELECT * FROM user WHERE confirmed = 0 AND firstaccess > 0 AND firstaccess < '$cutofftime'")) {
+    if ($users = get_records_sql("SELECT * FROM user 
+                                  WHERE confirmed = '0' AND 
+                                        firstaccess > '0' AND 
+                                        firstaccess < '$cutofftime'")) {
         foreach ($users as $user) {
-            delete_records("user", "id", $user->id);
-            echo "Deleted unconfirmed user for $user->firsname $user->lastname ($user->id)\n";
+            if (delete_records("user", "id", $user->id)) {
+                echo "Deleted unconfirmed user for $user->firsname $user->lastname ($user->id)\n";
+            }
         }
     }
 
diff --git a/mod/journal/lib.php b/mod/journal/lib.php
index c7fd845b6f..b48bd16858 100644
--- a/mod/journal/lib.php
+++ b/mod/journal/lib.php
@@ -53,8 +53,6 @@ function journal_cron () {
 
     global $CFG;
 
-    echo "Processing journals...\n";
-
     $cutofftime = time() - $CFG->maxeditingtime;
 
     if ($entries = get_records_sql("SELECT e.*, j.course, j.name
-- 
2.39.5