diff --git a/setup/migrate/migrateWizard.php b/setup/migrate/migrateWizard.php index 3f176b7..3b7b5bd 100644 --- a/setup/migrate/migrateWizard.php +++ b/setup/migrate/migrateWizard.php @@ -261,7 +261,7 @@ class MigrateWizard { } } else { // TODO: Die gracefully - $this->util->error("System has been migrated
"); + $this->util->error("System has been migrated Goto Login"); } } } diff --git a/setup/wizard/installWizard.php b/setup/wizard/installWizard.php index 9dc5ecf..c48aac0 100644 --- a/setup/wizard/installWizard.php +++ b/setup/wizard/installWizard.php @@ -287,14 +287,7 @@ class InstallWizard { $this->util->redirect('../migrate'); } elseif ($this->util->upgradeSpecified()) { $this->util->redirect('../upgrade/index.php?action=installer'); - }/* elseif ($this->util->loginSpecified()) { - header("Cache-Control: no-cache"); - $this->util->redirect('../../admin.php'); - } elseif ($this->util->zendSpecified()) { - $zend = "http://".$_SERVER['HTTP_HOST'].":10081/ZendServer/Index"; - header("Cache-Control: no-cache"); - $this->util->redirect($zend); - }*/ + } $response = $this->systemChecks(); if($response === true) { $this->displayInstaller(); @@ -303,7 +296,7 @@ class InstallWizard { } } else { // TODO: Die gracefully - $this->util->error("System has been installed "); + $this->util->error("System has been installed Goto Login"); } } } diff --git a/setup/wizard/templates/error.tpl b/setup/wizard/templates/error.tpl index 090e74f..67b08f0 100644 --- a/setup/wizard/templates/error.tpl +++ b/setup/wizard/templates/error.tpl @@ -9,7 +9,8 @@ -