diff --git a/admin/install.php b/admin/install.php index 21e3bcb..b5b64f0 100644 --- a/admin/install.php +++ b/admin/install.php @@ -28,9 +28,9 @@ if (is_file(CONF_FILENAME)) { } $error = null; +$installService = new InstallService(); if (!empty($_POST)) { - $installService = new InstallService(); $result = $installService->install($_POST, $smarty); if ($result['status'] === 'OK') { @@ -43,5 +43,5 @@ if (!empty($_POST)) { $smarty->assign('error', $error); $smarty->assign('title', __('Admin', 'Installation')); -$smarty->assign('logsAreReadable', is_readable('../' . LOG_FILE)); +$smarty->assign('fields', $installService->getFields()); $smarty->display('admin/install.tpl'); \ No newline at end of file diff --git a/app/classes/Framadate/Services/InstallService.php b/app/classes/Framadate/Services/InstallService.php index 2fd6841..2be482f 100644 --- a/app/classes/Framadate/Services/InstallService.php +++ b/app/classes/Framadate/Services/InstallService.php @@ -36,7 +36,7 @@ class InstallService { ), 'Database configuration' => array( - 'dbConnectionString' => 'mysql:host=HOST;dbname=SCHEMA;port=3306', + 'dbConnectionString' => 'mysql:host=;dbname=;port=3306', 'dbUser' => 'root', 'dbPassword' => '', 'dbPrefix' => 'fd_', @@ -133,4 +133,8 @@ class InstallService { ); } + public function getFields() { + return $this->fields; + } + } diff --git a/tpl/admin/install.tpl b/tpl/admin/install.tpl index da314e4..56fd362 100644 --- a/tpl/admin/install.tpl +++ b/tpl/admin/install.tpl @@ -15,28 +15,28 @@
- +
- +
- +
- @@ -50,7 +50,7 @@
- +
@@ -61,35 +61,35 @@
- +
- +
- +
- +
- +