Rename quatUser & quatPassword to something more descriptive

docs/config/config.xml

@@ -20,8 +20,8 @@
         <username>%USERNAME%</username>
         <password>%PASSWORD%</password>
         <database>%DATABASE%</database>
-        <quatUser>%USERNAME%</quatUser>
-        <quatPassword>%PASSWORD%</quatPassword>
+        <adminUser>%USERNAME%</adminUser>
+        <adminPassword>%PASSWORD%</adminPassword>
         <name>Example database</name>
     </database>
 
@@ -43,7 +43,7 @@
                 <seq type="alphanumeric" length="4"/> <!-- Ex: AAA0001-->
             </structure>
         </PSCID>
-        
+
         <ExternalID>
             <generation>random</generation>
             <structure>

docs/deprecated_wiki/Setup/Initial Setup/Behavioural Database/Behavioural-Database.md

@@ -277,16 +277,16 @@ The Instrument Manager module is designed allow the Loris database Admin superus
 
 To enable upload and installation of `*.linst` instrument files created using the Instrument Builder: 
 
-i. **Create a separate MySQL user account with CREATE, SELECT, INSERT, UPDATE and DELETE privileges** on the database. This credential should be stored in `project/config.xml` within the `<database>` tag section as `<quatUser>` and `<quatPassword>` : 
+i. **Create a separate MySQL user account with CREATE, SELECT, INSERT, UPDATE and DELETE privileges** on the database. This credential should be stored in `project/config.xml` within the `<database>` tag section as `<adminUser>` and `<adminPassword>` : 
    ```xml
    <database>
         ...
-        <quatUser>%USERNAME%</quatUser>
-        <quatPassword>%PASSWORD%</quatPassword>
+        <adminUser>%USERNAME%</adminUser>
+        <adminPassword>%PASSWORD%</adminPassword>
         ...
     </database>
    ```
 
 ii.  **Ensure that the project-specific directories are Apache-writeable**: `project/instruments/` and `project/tables_sql/`
 
-**[[NEXT: (4) Imaging Database|Imaging-Database]]**
+**[[NEXT: (4) Imaging Database|Imaging-Database]]**

modules/instrument_manager/README.md

@@ -49,5 +49,6 @@ directories (to write the instrument itself, and instrument table
 patch respectively.)
 
 In order to automatically source the SQL patch and fully configure
-LINST instruments, the LORIS `quatUser` and `quatPassword` configuration
+LINST instruments, the LORIS `adminUser` and `adminPassword` configuration
 must be set to a user which has the MySQL `CREATE TABLE` permission.
+

modules/instrument_manager/jsx/instrumentManagerIndex.js

@@ -111,7 +111,7 @@ class InstrumentManagerIndex extends Component {
         return (
           <div className='alert alert-warning'>
             Instrument installation is not possible given the current server
-            configuration; the LORIS 'quatUser' is not configured properly.
+            configuration; the LORIS 'adminUser' is not configured properly.
             File upload is still possible but instruments will need to be
             installed manually
           </div>

modules/instrument_manager/php/instrument_manager.class.inc

@@ -169,7 +169,7 @@ class Instrument_Manager extends \NDB_Menu_Filter
                  * Instead, inform users that an administrator must install it
                  * on their behalf.
                  * This should only happen for users on a system where automatic
-                 * installation is disabled (ie. has no quatUser).
+                 * installation is disabled (ie. has no adminUser).
                  */
                 return new \LORIS\Http\Response\JSON\Conflict(
                     self::FILE_ALREADY_EXISTS
@@ -189,7 +189,7 @@ class Instrument_Manager extends \NDB_Menu_Filter
         );
 
         if (!$this->isQuatUserConfigured()) {
-            // If no quatUser is configured, automatic installation is not
+            // If no adminUser is configured, automatic installation is not
             // possible, so this is the last step.
             return (new \LORIS\Http\Response())
                 ->withStatus(200, 'OK')
@@ -224,8 +224,8 @@ class Instrument_Manager extends \NDB_Menu_Filter
         exec(
             "mysql".
             " -h" . escapeshellarg($db_config['host']).
-            " -u" . escapeshellarg($db_config['quatUser']).
-            " -p" . escapeshellarg($db_config['quatPassword']).
+            " -u" . escapeshellarg($db_config['adminUser']).
+            " -p" . escapeshellarg($db_config['adminPassword']).
             " " . escapeshellarg($db_config['database']).
             " < " . $this->path . "project/tables_sql/".
             escapeshellarg($table_name . '.sql'),
@@ -591,21 +591,21 @@ class Instrument_Manager extends \NDB_Menu_Filter
     }
 
     /**
-     * Return whether the quatUser is properly configured, ie. credentials are
+     * Return whether the adminUser is properly configured, ie. credentials are
      * set and are valid.
-     * The quatUser is a MySQL user with CREATE table permissions.
+     * The adminUser is a MySQL user with CREATE table permissions.
      * `empty` is used instead of `isset` as blank values in the config file
      * are still considered set.
      *
-     * @return bool True if a quatUser is configured properly. False if not.
+     * @return bool True if a adminUser is configured properly. False if not.
      */
     protected function isQuatUserConfigured() : bool
     {
         $db        = $this->factory->database();
         $db_config = $this->factory->config()->getSetting('database');
 
-        $credentials_set = !empty($db_config['quatUser'])
-            && !empty($db_config['quatPassword']);
+        $credentials_set = !empty($db_config['adminUser'])
+            && !empty($db_config['adminPassword']);
         if (!$credentials_set) {
             return false;
         }
@@ -615,8 +615,8 @@ class Instrument_Manager extends \NDB_Menu_Filter
         try {
             $connected = $db->connect(
                 $db_config['database'],
-                $db_config['quatUser'],
-                $db_config['quatPassword'],
+                $db_config['adminUser'],
+                $db_config['adminPassword'],
                 $db_config['host'],
                 false
             );

raisinbread/config/config.xml

@@ -20,8 +20,8 @@
         <username>%USERNAME%</username>
         <password>%PASSWORD%</password>
         <database>%DATABASE%</database>
-        <quatUser>%USERNAME%</quatUser>
-        <quatPassword>%PASSWORD%</quatPassword>
+        <adminUser>%USERNAME%</adminUser>
+        <adminPassword>%PASSWORD%</adminPassword>
         <name>Example database</name>
     </database>
 

test/config.xml

@@ -21,8 +21,8 @@
         <username>SQLTestUser</username>
         <password>TestPassword</password>
         <database>LorisTest</database>
-        <quatUser>SQLTestUser</quatUser>
-        <quatPassword>TestPassword</quatPassword>
+        <adminUser>SQLTestUser</adminUser>
+        <adminPassword>TestPassword</adminPassword>
         <name>Example database</name>
     </database>
 
@@ -39,7 +39,7 @@
                 <seq type="alphanumeric" length="4"/> <!-- Ex: AAA0001-->
             </structure>
         </PSCID>
-        
+
         <ExternalID>
             <generation>random</generation>
             <structure>

tools/exporters/DB_dump_table_data.php

@@ -36,13 +36,13 @@
     array("dbn"=>$databaseInfo['database'])
 );
 
-$dbUser = $databaseInfo["quatUser"];
-$dbPassword = $databaseInfo["quatPassword"];
+$adminUser = $databaseInfo["adminUser"];
+$adminPassword = $databaseInfo["adminPassword"];
 $dbHost = $databaseInfo["host"];
 
-if (empty($dbUser) || empty($dbPassword) || empty($dbHost)) {
+if (empty($adminUser) || empty($adminPassword) || empty($dbHost)) {
     echo "\n\n Some database credentials are missing, please ensure administrator 
-    credentials (quatUser, quatPassword) and a host value are available in your 
+    credentials (adminUser, adminPassword) and a host value are available in your 
     configuration file. \n\n";
     die();
 }
@@ -71,7 +71,7 @@
 foreach ($tableNames as $tableName) {
     $paths = \NDB_Config::singleton()->getSetting('paths');
     $filename = $paths['base'] . "/raisinbread/RB_files/RB_$tableName.sql";
-    exec('mysqldump -u '.escapeshellarg($dbUser).' -p'.escapeshellarg($dbPassword).' -h '.escapeshellarg($dbHost).' '.
+    exec('mysqldump -u '.escapeshellarg($adminUser).' -p'.escapeshellarg($adminPassword).' -h '.escapeshellarg($dbHost).' '.
         escapeshellarg($databaseInfo['database']).' '.
         '--complete-insert '.
         '--no-create-db '.

tools/single_use/Engine_Change_MyISAM_to_INNODB.php

@@ -19,8 +19,8 @@
 $dbConfig = $config->getSetting("database");
 $adminDB  = Database::singleton(
     $dbConfig["database"],
-    $dbConfig["quatUser"],
-    $dbConfig["quatPassword"],
+    $dbConfig["adminUser"],
+    $dbConfig["adminPassword"],
     $dbConfig["host"],
     true
 );