From d012cddf78d3055c8c49af7a7287117940f2c034 Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Tue, 26 Feb 2013 13:36:31 +0100
Subject: #2020 - Add CLI install argument to set admin password. This isn't
 too useful for end users, but would be really useful for developers that
 install Gallery3 over and over again...

---
 installer/cli.php       | 4 ++++
 installer/installer.php | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'installer')

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"],
-- 
cgit v1.2.3