From 8c1820065209ea6a9f5c480246cedbdca79412bc Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Tue, 17 Oct 2006 20:47:12 +0000
Subject: [PATCH] =?utf8?q?Automatic=20deletion=20of=20users=20when=20delet?=
 =?utf8?q?eunconfirmed=20is=20setted=20to=20'never'=20MDL-6726;=20merged?=
 =?utf8?q?=20from=20MOODLE=5F17=5FSTABLE=20patch=20submitted=20by=20Jes?=
 =?utf8?q?=C3=BAs=20Torres?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 admin/cron.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/admin/cron.php b/admin/cron.php
index bfb128e2e0..db0b9ec820 100644
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -143,11 +143,13 @@
     
         /// Delete users who haven't confirmed within required period
 
-        $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
-        if ($users = get_users_unconfirmed($oneweek)) {
-            foreach ($users as $user) {
-                if (delete_records('user', 'id', $user->id)) {
-                    mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
+        if (!empty($CFG->deleteunconfirmed)) {
+            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+            if ($users = get_users_unconfirmed($oneweek)) {
+                foreach ($users as $user) {
+                    if (delete_records('user', 'id', $user->id)) {
+                        mtrace("Deleted unconfirmed user for ".fullname($user, true)." ($user->id)");
+                    }
                 }
             }
         }
@@ -157,11 +159,13 @@
 
         /// Delete users who haven't completed profile within required period
 
-        $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
-        if ($users = get_users_not_fully_set_up($oneweek)) {
-            foreach ($users as $user) {
-                if (delete_records('user', 'id', $user->id)) {
-                    mtrace("Deleted not fully setup user $user->username ($user->id)");
+        if (!empty($CFG->deleteunconfirmed)) {
+            $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
+            if ($users = get_users_not_fully_set_up($oneweek)) {
+                foreach ($users as $user) {
+                    if (delete_records('user', 'id', $user->id)) {
+                        mtrace("Deleted not fully setup user $user->username ($user->id)");
+                    }
                 }
             }
         }
-- 
2.39.5