Some cron performance. Run clean-ups and send email daily on settlement date.

an_nextmail config deleted, instead of old config new an_dailysettlement inserted into config_plugins table.
Merged from MOODLE_16_STABLE.

diff --git a/enrol/authorize/db/mysql.php b/enrol/authorize/db/mysql.php
index b9eba87c5bb4183858658c22247a02277884f3d3..39598a5bfeeeaf811f0ac62ea4b80b7f3f9577b9 100755 (executable)
--- a/enrol/authorize/db/mysql.php
+++ b/enrol/authorize/db/mysql.php
@@ -19,7 +19,7 @@ function enrol_authorize_upgrade($oldversion=0) {
     }
 
     if ($oldversion && $oldversion < 2005071602) {
-        notify("If you are using the authorize.net enrolment plugin for credit card 
+        notify("If you are using the authorize.net enrolment plugin for credit card
                 handling, please ensure that you have turned loginhttps ON in Admin >> Variables >> Security.");
     }
 
@@ -104,11 +104,19 @@ function enrol_authorize_upgrade($oldversion=0) {
         table_column('enrol_authorize', 'transid', 'transid', 'integer', '10', 'unsigned', '0', 'not null');
     }
 
+    if ($oldversion < 2006021501) { // delete an_nextmail record from config_plugins table
+        delete_records('config_plugins', 'name', 'an_nextmail');
+    }
+
     if ($oldversion < 2006050400) { // Create transid indexes for backup & restore speed.
         execute_sql("ALTER TABLE `{$CFG->prefix}enrol_authorize` ADD INDEX transid(transid)", false);
         execute_sql("ALTER TABLE `{$CFG->prefix}enrol_authorize_refunds` ADD INDEX transid(transid)", false);
     }
 
+    if ($oldversion < 2006060500) { // delete an_nextmail record from config_plugins table
+        delete_records('config_plugins', 'name', 'an_nextmail'); // run twice.
+    }
+
     return $result;
 }
 

diff --git a/enrol/authorize/db/postgres7.php b/enrol/authorize/db/postgres7.php
index d1ff1cf9745c4f59e8d6a0580a988ea7a8794dfe..abd3d4b4d642a5a52d3048e226d24e377e7006d8 100644 (file)
--- a/enrol/authorize/db/postgres7.php
+++ b/enrol/authorize/db/postgres7.php
@@ -115,11 +115,19 @@ function enrol_authorize_upgrade($oldversion=0) {
         table_column('enrol_authorize', 'transid', 'transid', 'integer', '10', 'unsigned', '0', 'not null');
     }
 
+    if ($oldversion < 2006021501) { // delete an_nextmail record from config_plugins table
+        delete_records('config_plugins', 'name', 'an_nextmail');
+    }
+
     if ($oldversion < 2006050400) { // Create transid indexes for backup & restore speed.
         execute_sql("CREATE INDEX {$CFG->prefix}enrol_authorize_transid_idx ON {$CFG->prefix}enrol_authorize(transid);", false);
         execute_sql("CREATE INDEX {$CFG->prefix}enrol_authorize_refunds_transid_idx ON {$CFG->prefix}enrol_authorize_refunds(transid);", false);
     }
 
+    if ($oldversion < 2006060500) { // delete an_nextmail record from config_plugins table
+        delete_records('config_plugins', 'name', 'an_nextmail'); // run twice.
+    }
+
     return $result;
 }
 

diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
index 09eb80aae867f0fb99f31fbc504642133c4d0e4d..6a2eab3ac6e1a88e8b2e1a7becae333eff8ffd52 100755 (executable)
--- a/enrol/authorize/enrol.php
+++ b/enrol/authorize/enrol.php
@@ -631,40 +631,35 @@ class enrolment_plugin_authorize
 
         $oneday = 86400;
         $timenow = time();
-        $random100 = mt_rand(0, 100);
         $timenowsettle = getsettletime($timenow);
         $timediff30 = $timenowsettle - (30 * $oneday);
         $mconfig = get_config('enrol/authorize');
         set_config('an_lastcron', $timenow, 'enrol/authorize');
 
-        if ($random100 < 33) {
-            $select = "(status = '" .AN_STATUS_NONE. "') AND (timecreated < '$timediff30')";
+        if (intval($mconfig->an_dailysettlement) <= $timenowsettle) {
+            set_config('an_dailysettlement', $timenowsettle + $oneday, 'enrol/authorize');
+            // Some clean-up and update
+            $select = "(status='".AN_STATUS_NONE."') AND (timecreated<'$timediff30')";
             delete_records_select('enrol_authorize', $select);
-        }
-        elseif ($random100 > 66) {
-            $select = "(status = '" .AN_STATUS_AUTH. "') AND (timecreated < '$timediff30')";
-            execute_sql("UPDATE {$CFG->prefix}enrol_authorize SET status = '" .AN_STATUS_EXPIRE. "' WHERE $select", false);
-        }
-        else {
+            $select = "(status='".AN_STATUS_AUTH."') AND (timecreated<'$timediff30')";
+            execute_sql("UPDATE {$CFG->prefix}enrol_authorize SET status='".AN_STATUS_EXPIRE."' WHERE $select", false);
             $timediff60 = $timenowsettle - (60 * $oneday);
-            $select = "(status = '" .AN_STATUS_EXPIRE. "') AND (timecreated < '$timediff60')";
+            $select = "(status='".AN_STATUS_EXPIRE."') AND (timecreated<'$timediff60')";
             delete_records_select('enrol_authorize', $select);
-        }
-
-        if (!empty($CFG->an_emailexpired) && intval($mconfig->an_nextmail) < $timenowsettle) {
-            set_config('an_nextmail', $timenowsettle + $oneday + 1, 'enrol/authorize');
-            $timediffem = $timenowsettle - ((30 - intval($CFG->an_emailexpired)) * $oneday);
-            $select = "(status = '" . AN_STATUS_AUTH . "') AND " .
-            "(timecreated < '$timediffem') AND (timecreated > '$timediff30')";
-            if ($count = count_records_select('enrol_authorize', $select)) {
-                $a = new stdClass;
-                $a->pending = $count;
-                $a->days = $CFG->an_emailexpired;
-                $a->enrolurl = "$CFG->wwwroot/$CFG->admin/users.php";
-                $a->url = $CFG->wwwroot."/enrol/authorize/index.php?status=".AN_STATUS_AUTH;
-                $message = get_string('pendingordersemail', 'enrol_authorize', $a);
-                $adminuser = get_admin();
-                email_to_user($adminuser, $adminuser, "WARNING: PENDING PAYMENTS", $a);
+            // Daily warning email for expiring pending orders.
+            if (!empty($CFG->an_emailexpired)) {
+                $timediffem = $timenowsettle - ((30 - intval($CFG->an_emailexpired)) * $oneday);
+                $select = "(status='". AN_STATUS_AUTH ."') AND (timecreated<'$timediffem') AND (timecreated>'$timediff30')";
+                if ($count = count_records_select('enrol_authorize', $select)) {
+                    $a = new stdClass;
+                    $a->pending = $count;
+                    $a->days = $CFG->an_emailexpired;
+                    $a->enrolurl = "$CFG->wwwroot/$CFG->admin/users.php";
+                    $a->url = $CFG->wwwroot."/enrol/authorize/index.php?status=".AN_STATUS_AUTH;
+                    $message = get_string('pendingordersemail', 'enrol_authorize', $a);
+                    $adminuser = get_admin();
+                    email_to_user($adminuser, $adminuser, "WARNING: PENDING PAYMENTS", $a);
+                }
             }
         }
 

diff --git a/enrol/authorize/version.php b/enrol/authorize/version.php
index 8703773883ee1e59e2aeaa6ee7242b45db00377c..8a706ccd485848e73a9aefe0f3b17902e4e5510f 100755 (executable)
--- a/enrol/authorize/version.php
+++ b/enrol/authorize/version.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-$plugin->version  = 2006050400;
+$plugin->version  = 2006060500;
 $plugin->requires = 2005072200;
 
 ?>