diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-02-26 08:34:21 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-02-26 08:34:21 -0800 |
| commit | 80356e857d02e88de0dd4791496af270b6dcdae7 (patch) | |
| tree | 794705c1909a53a9229ce0dee3ce5206cd852dcc /installer | |
| parent | 6993a88669d19be84f59dcadbe679a6b005e038f (diff) | |
| parent | d012cddf78d3055c8c49af7a7287117940f2c034 (diff) | |
Merge pull request #167 from shadlaws/fix_2020
#2020 - Add CLI install argument to set admin password.
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/cli.php | 4 | ||||
| -rw-r--r-- | installer/installer.php | 4 |
2 files changed, 7 insertions, 1 deletions
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"], |