Merge pull request #167 from shadlaws/fix_2020

#2020 - Add CLI install argument to set admin password.

3 files changed, 8 insertions, 2 deletions

diff --git a/index.php b/index.php
index 5f6d231b..e6636cf1 100644
--- a/index.php
+++ b/index.php
@@ -93,7 +93,7 @@ if (PHP_SAPI == "cli") {
 
   default:
     print "To install:\n";
-    print "  php index.php install -d database -h host -u user -p password -x table_prefix \n\n";
+    print "  php index.php install -d database -h host -u user -p password -x table_prefix -g3p gallery3_admin_password \n\n";
     print "To upgrade:\n";
     print "  php index.php upgrade\n\n";
     print "Developer-only features:\n";
diff --git a/installer/cli.php b/installer/cli.php
index f5a9e260..b31405f1 100644
--- a/installer/cli.php
+++ b/installer/cli.php
@@ -90,6 +90,7 @@ function parse_cli_params() {
                   "password" => "",
                   "dbname" => "gallery3",
                   "prefix" => "",
+                  "g3_password" => "",
                   "type" => function_exists("mysqli_set_charset") ? "mysqli" : "mysql");
 
   $argv = $_SERVER["argv"];
@@ -110,6 +111,9 @@ function parse_cli_params() {
     case "-x":
       $config["prefix"] = $argv[++$i];
       break;
+    case "-g3p":
+      $config["g3_password"] = $argv[++$i];
+      break;
     }
   }
 
diff --git a/installer/installer.php b/installer/installer.php
index 4ce80ee7..434d8e53 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -138,7 +138,9 @@ class installer {
       $char += ($char > 90) ? 13 : ($char > 57) ? 7 : 0;
       $salt .= chr($char);
     }
-    $password = substr(md5(time() . mt_rand()), 0, 6);
+    if (!$password = $config["g3_password"]) {
+      $password = substr(md5(time() . mt_rand()), 0, 6);
+    }
     // Escape backslash in preparation for our UPDATE statement.
     $hashed_password = str_replace("\\", "\\\\", $salt . md5($salt . $password));
     $sql = self::prepend_prefix($config["prefix"],