tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not redirect to the wizard in case of an empty config.ini

This commit is contained in:
Johannes Meyer 2014-11-18 13:13:02 +01:00
parent 4ab5b2abf3
commit be6358452e
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
application/controllers/AuthenticationController.php
View File

@ -33,16 +33,9 @@ class AuthenticationController extends ActionController
*/ */
public function loginAction() public function loginAction()
{ {
if (@file_exists(Config::$configDir . '/setup.token')) { if (@file_exists(Config::resolvePath('setup.token')) && !@file_exists(Config::resolvePath('config.ini'))) {
try {
$config = Config::app()->toArray();
if (empty($config)) {
$this->redirectNow(Url::fromPath('setup')); $this->redirectNow(Url::fromPath('setup'));
} }
} catch (NotReadableError $e) {
// Gets thrown in case of insufficient permission only
}
}
$auth = $this->Auth(); $auth = $this->Auth();
$this->view->form = $form = new LoginForm(); $this->view->form = $form = new LoginForm();