From c1eb067d9abd821594430a448398d53ae87356ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Sat, 8 Aug 2015 01:30:24 +0200 Subject: [PATCH] Allow to pass database credentials via env in WCFSetup --- .../files/lib/system/WCFSetup.class.php | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php index cecd532ed9..598850a8b7 100644 --- a/wcfsetup/install/files/lib/system/WCFSetup.class.php +++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php @@ -571,19 +571,29 @@ class WCFSetup extends WCF { */ protected function configureDB() { $availableDBClasses = self::getAvailableDBClasses(); - $dbHost = 'localhost'; - $dbUser = 'root'; - $dbPassword = ''; - $dbName = 'wcf'; - $dbNumber = 1; - $dbClass = ''; + if (self::$developerMode && isset($_ENV['WCFSETUP_DBHOST'])) { + $dbHost = $_ENV['WCFSETUP_DBHOST']; + $dbUser = $_ENV['WCFSETUP_DBUSER']; + $dbPassword = $_ENV['WCFSETUP_DBPASSWORD']; + $dbName = $_ENV['WCFSETUP_DBNAME']; + $dbNumber = 1; + } + else { + $dbHost = 'localhost'; + $dbUser = 'root'; + $dbPassword = ''; + $dbName = 'wcf'; + $dbNumber = 1; + $dbClass = ''; + } + // set $dbClass to first item in $availableDBClasses foreach ($availableDBClasses as $dbClass) { $dbClass = $dbClass['class']; break; } - if (isset($_POST['send'])) { + if (isset($_POST['send']) || (self::$developerMode && isset($_ENV['WCFSETUP_DBHOST']))) { if (isset($_POST['dbHost'])) $dbHost = $_POST['dbHost']; if (isset($_POST['dbUser'])) $dbUser = $_POST['dbUser']; if (isset($_POST['dbPassword'])) $dbPassword = $_POST['dbPassword']; -- 2.20.1