From 6c61fd041ebc6b852322f0928b66d712830f5c4d Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Tue, 16 Mar 2004 10:59:42 +0000
Subject: [PATCH] Whoops!  Just realised I never fully finished the
 deleteunconfirmed feature!   All done now.

---
 admin/config.html  | 24 ++++++++++++++++++++++++
 admin/cron.php     |  6 +-----
 lang/en/moodle.php |  2 ++
 lib/defaults.php   |  1 +
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/admin/config.html b/admin/config.html
index e6e3db38862..7594621260d 100644
--- a/admin/config.html
+++ b/admin/config.html
@@ -178,6 +178,30 @@
     </td>
 </tr>
 <tr valign=top>
+	<td align=right><p>deleteunconfirmed:</td>
+	<td>
+    <?php 
+       unset($options);
+       $options[0]    = get_string("never");
+       $options[168]  = get_string("numdays", "", 7);
+       $options[144]  = get_string("numdays", "", 6);
+       $options[120]  = get_string("numdays", "", 5);
+       $options[96]   = get_string("numdays", "", 4);
+       $options[72]   = get_string("numdays", "", 3);
+       $options[48]   = get_string("numdays", "", 2);
+       $options[24]   = get_string("numdays", "", 1);
+       $options[12]   = get_string("numhours", "", 12);
+       $options[6]    = get_string("numhours", "", 6);
+       $options[1]    = get_string("numhours", "", 1);
+
+       choose_from_menu ($options, "deleteunconfirmed", $config->deleteunconfirmed, "", "", "");
+    ?>
+    </td>
+    <td>
+    <?php print_string("configdeleteunconfirmed") ?>
+    </td>
+</tr>
+<tr valign=top>
 	<td align=right><p>loglifetime:</td>
 	<td>
     <?php 
diff --git a/admin/cron.php b/admin/cron.php
index 3d05cf12942..6fbae20ff16 100644
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -67,12 +67,8 @@
         }
     
     
-        /// Delete users who haven't confirmed within seven days
+        /// Delete users who haven't confirmed within required period
 
-        if (empty($CFG->deleteunconfirmed)) { // value in hours
-            $CFG->deleteunconfirmed = 168;  
-        }
-    
         $oneweek = $timenow - ($CFG->deleteunconfirmed * 3600);
         if ($users = get_users_unconfirmed($oneweek)) {
             foreach ($users as $user) {
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index cf132b34afb..edcdeab15f4 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -67,6 +67,7 @@ $string['allparticipants'] = 'All participants';
 $string['alphabet'] = 'A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z';
 $string['alphanumerical'] = 'Can only contain alphabetical letters or numbers';
 $string['alreadyconfirmed'] = 'Registration has already been confirmed';
+$string['always'] = 'Always';
 $string['answer'] = 'Answer';
 $string['areyousuretorestorethis'] = 'Do you want to continue?';
 $string['areyousuretorestorethisinfo'] = 'Later in this process you will have a choice of adding this backup to an existing course or creating a completely new course.';
@@ -130,6 +131,7 @@ $string['configallowunenroll'] = 'If this is set \'Yes\', then students are allo
 $string['configcachetext'] = 'For larger sites or sites that use text filters, this setting can really speed things up.  Copies of texts will be retained in their processed form for the time specified here.  Setting this too small may actually slow things down slightly,  but setting it too large may mean texts take too long to refresh (with new links, for example).';
 $string['configcountry'] = 'If you set a country here, then this country will be selected by default on new user accounts.  To force users to choose a country, just leave this unset.';
 $string['configdebug'] = 'If you turn this on, then PHP\'s error_reporting will be increased so that more warnings are printed.  This is only useful for developers.';
+$string['configdeleteunconfirmed'] = 'If you are using email authentication, this is the period within which a response will be accepted from users.  After this period, old unconfirmed accounts are deleted.';
 $string['configerrorlevel'] = 'Choose the amount of PHP warnings that you want to be displayed.  Normal is usually the best choice.';
 $string['configfilteruploadedfiles'] = 'Enabling this setting will cause Moodle to process all uploaded HTML and text files with the filters before displaying them.';
 $string['configforcelogin'] = 'Normally, the front page of the site and the course listings (but not courses) can be read by people without logging in to the site.  If you want to force people to log in before they do ANYTHING on the site, then you should enable this setting.';
diff --git a/lib/defaults.php b/lib/defaults.php
index cb581f24f14..18b15eb8b1a 100644
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -10,6 +10,7 @@
        "changepassword"   =>  true,
        "country"          => "",
        "debug"            =>  7,
+       "deleteunconfirmed" => 168,
        "filteruploadedfiles"  =>  true,
        "forcelogin"       =>  false,
        "fullnamedisplay"  => "firstname lastname",
-- 
2.11.4.GIT