diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2014-01-31 16:57:49 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2014-01-31 16:57:49 +0100 |
| commit | 12a900de2539a31b0bbfbba9ffa861fb0f36e8cd (patch) | |
| tree | 0c85698d5a79f9a7529a0ca875f02f82fe44d06c /core/setup | |
| parent | bca725dc32e159d756f023d428816b8f9821b732 (diff) | |
| download | nextcloud-server-12a900de2539a31b0bbfbba9ffa861fb0f36e8cd.tar.gz nextcloud-server-12a900de2539a31b0bbfbba9ffa861fb0f36e8cd.zip | |
Do setup default value handling in the controller not the template
Diffstat (limited to 'core/setup')
| -rw-r--r-- | core/setup/controller.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/core/setup/controller.php b/core/setup/controller.php index 0c87103138b..5189aba2f34 100644 --- a/core/setup/controller.php +++ b/core/setup/controller.php @@ -33,11 +33,21 @@ class Controller { } public function display($post) { + $defaults = array( + 'adminlogin' => '', + 'adminpass' => '', + 'dbuser' => '', + 'dbpass' => '', + 'dbname' => '', + 'dbtablespace' => '', + 'dbhost' => '', + ); + $parameters = array_merge($defaults, $post); \OC_Util::addScript( '3rdparty', 'strengthify/jquery.strengthify' ); \OC_Util::addStyle( '3rdparty', 'strengthify/strengthify' ); \OC_Util::addScript('setup'); - \OC_Template::printGuestPage('', 'installation', $post); + \OC_Template::printGuestPage('', 'installation', $parameters); } public function finishSetup() { |