Merged from MOODLE_15_STABLE.

diff --git a/enrol/authorize/db/mysql.php b/enrol/authorize/db/mysql.php
index c3760ea092a9c96b235f6d8f42d027182aca5887..6dee07f7825a05e7a9cb31c7e2a212841994bedc 100755 (executable)
--- a/enrol/authorize/db/mysql.php
+++ b/enrol/authorize/db/mysql.php
@@ -8,7 +8,11 @@ function enrol_authorize_upgrade($oldversion=0) {
 
     $result = true;
 
-    if ($oldversion == 0) { // First time install
+    if (!$tables = $db->MetaColumns($CFG->prefix . 'enrol_authorize')) {
+        $installfirst = true;
+    }
+
+    if ($oldversion == 0 || !empty($installfirst)) { // First time install
         $result = modify_database("$CFG->dirroot/enrol/authorize/db/mysql.sql");
         return $result; // RETURN, sql file contains last upgrades.
     }
@@ -25,6 +29,11 @@ function enrol_authorize_upgrade($oldversion=0) {
         execute_sql(" ALTER TABLE `{$CFG->prefix}enrol_authorize` ADD INDEX userid(userid) ");
     }
 
+    if ($oldversion < 2005071602) {
+        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.");
+    }
+
     if ($oldversion < 2005112100) {
         table_column('enrol_authorize', '', 'authcode', 'varchar', '6', '', '', '', 'avscode'); // CAPTURE_ONLY
         table_column('enrol_authorize', '', 'status', 'integer', '10', 'unsigned', '0', 'not null', 'transid');

diff --git a/enrol/authorize/db/postgres7.php b/enrol/authorize/db/postgres7.php
index e206da11cfbeaa0d5c4d776299509d7c9cd9875c..1e006f98d78f132b31ea3b76557aaf2ee7b6ff1f 100644 (file)
--- a/enrol/authorize/db/postgres7.php
+++ b/enrol/authorize/db/postgres7.php
@@ -19,6 +19,11 @@ function enrol_authorize_upgrade($oldversion=0) {
 
     // Authorize module was installed before. Upgrades must be applied to SQL file.
 
+    if ($oldversion < 2005071602) {
+        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.");
+    }
+
     if ($oldversion < 2005080200) {
         // Be sure, only last 4 digit is inserted.
         table_column('enrol_authorize', 'cclastfour', 'cclastfour', 'integer', '4', 'unsigned', '0', 'not null');