From: skodak <skodak>
Date: Tue, 17 Oct 2006 20:47:12 +0000 (+0000)
Subject: Automatic deletion of users when deleteunconfirmed is setted to 'never' MDL-6726... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=8c1820065209ea6a9f5c480246cedbdca79412bc;p=moodle.git

Automatic deletion of users when deleteunconfirmed is setted to 'never' MDL-6726; merged from MOODLE_17_STABLE patch submitted by Jesús Torres
---

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)");
+                    }
                 }
             }
         }