Merge pull request #25 from catalystfd/reserved_words

Change database columnname from usage to uses

Author: brendanheywood

auth.php

@@ -181,7 +181,7 @@ private function is_master_password($userpassword) {
             if (!empty($masterpassword)) {
                 $whitelistips = $CFG->auth_basic_whitelist_ips;;
                 if (empty($whitelistips) || remoteip_in_list($whitelistips)) {
-                    $masterpassword->usage += 1;
+                    $masterpassword->uses += 1;
                     $DB->update_record('auth_basic_master_password', $masterpassword);
                     return true;
                 } else {

db/install.xml

@@ -9,7 +9,7 @@
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
         <FIELD NAME="userid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" COMMENT="The user who own this password"/>
         <FIELD NAME="password" TYPE="text" NOTNULL="true" SEQUENCE="false" COMMENT="Master Password"/>
-        <FIELD NAME="usage" TYPE="int" LENGTH="10" NOTNULL="false" DEFAULT="0" SEQUENCE="false"/>
+        <FIELD NAME="uses" TYPE="int" LENGTH="10" NOTNULL="false" DEFAULT="0" SEQUENCE="false"/>
         <FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
         <FIELD NAME="timeexpired" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
       </FIELDS>

db/upgrade.php

@@ -67,5 +67,18 @@ function xmldb_auth_basic_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2020083100, 'auth', 'basic');
     }
 
+    if ($oldversion < 2020120300) {
+
+        // Rename field usage on table auth_basic_master_password to uses.
+        $table = new xmldb_table('auth_basic_master_password');
+        $field = new xmldb_field('usage', XMLDB_TYPE_INTEGER, '10', null, null, null, '0', 'password');
+
+        // Launch rename field
+        $dbman->rename_field($table, $field, 'uses');
+
+        // Basic savepoint reached.
+        upgrade_plugin_savepoint(true, 2020120300, 'auth', 'basic');
+    }
+
     return true;
 }

lang/en/auth_basic.php

@@ -56,6 +56,6 @@
 $string["regeneratepassword"] = "Regenerate Passwords";
 
 $string["username"] = "Name";
-$string["usage"] = "Usage";
+$string["uses"] = "Usage";
 $string["timecreated"] = "Time Created";
 $string["timeexpired"] = "Time Expired";

masterpassword.php

@@ -61,7 +61,7 @@
     $record = new stdClass();
     $record->password = $formdata->password;
     $record->userid = $USER->id;
-    $record->usage = 0;
+    $record->uses = 0;
     $record->timecreated = time();
     $record->timeexpired = time() + DAYSECS;
     $DB->insert_record('auth_basic_master_password', $record);
@@ -93,7 +93,7 @@
         $table->head = array(
             get_string('username', 'auth_basic'),
             get_string('password', 'auth_basic'),
-            get_string('usage', 'auth_basic'),
+            get_string('uses', 'auth_basic'),
             get_string('timecreated', 'auth_basic'),
             get_string('timeexpired', 'auth_basic'),
         );
@@ -107,7 +107,7 @@
                 $row[] = "*hidden*";
             }
 
-            $row[] = $record->usage;
+            $row[] = $record->uses;
             $row[] = userdate($record->timecreated, get_string('strftimerecentfull'));
             $row[] = userdate($record->timeexpired, get_string('strftimerecentfull'));
             $table->data[] = $row;

version.php

@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2020101300;    // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2020120300;    // The current plugin version (Date: YYYYMMDDXX).
 $plugin->release   = 2020101300;    // Match release exactly to version.
 $plugin->requires  = 2014050800;    // Requires this Moodle version.
 $plugin->component = 'auth_basic';  // Full name of the plugin (used for diagnostics).