From 97d228a9bcece4e0cb17416bd9c4ff92e0fa8f5b Mon Sep 17 00:00:00 2001 From: Micke2k Date: Mon, 28 Mar 2016 00:56:05 +0400 Subject: [PATCH] Cleaned install Made modern css default for install, makes it look a better. Change comments to better reflect the code removed some whitespace Still left todo: Backport plugin import Show log from sql install when upgrading Test windows install and upgrade Working on windows now. --- install/index.php | 120 +++++++++++++++++++++------------------------- 1 file changed, 55 insertions(+), 65 deletions(-) diff --git a/install/index.php b/install/index.php index fe49e35f1f..a615edd6af 100644 --- a/install/index.php +++ b/install/index.php @@ -517,34 +517,34 @@ function install_file_paths () { if (isset($_REQUEST['step']) && $_REQUEST['step'] > 0) { $step = intval($_REQUEST['step']); - /* license and welcome screen - send to dependencies */ + /* license&welcome - send to checkdependencies */ if ($step == '1') { $step = '2'; - /* check for dependencies - send to install/upgrade */ + /* checkdependencies - send to install/upgrade */ } elseif ($step == '2') { $step = '3'; - /* install/upgrade - if user chooses "New Install" send to pathcheck */ + /* install/upgrade - if user chooses "New Install" send to settingscheck */ } elseif (($step == '3') && ($_REQUEST['install_type'] == '1')) { $step = '4'; /* install/upgrade - if user chooses "Upgrade" send to upgrade */ } elseif (($step == '3') && ($_REQUEST['install_type'] == '3')) { $step = '8'; - /* upgrade-oldversion - if user runs old version send to oldversionwarning*/ + /* upgrade - if user runs old version send to upgrade-oldversion*/ } elseif (($step == '8') && ($old_version_index <= array_search('0.8.5a', $cacti_versions))) { $step = '9'; - /* upgrade - if user upgrades send to pathcheck */ + /* upgrade - if user upgrades send to checkdependencies */ } elseif ($step == '8') { - $step = '4'; - /* oldversionwarning - if user upgrades from old version send to dependencies */ + $step = '3'; + /* upgrade-oldversion - if user upgrades from old version send to checkdependencies */ } elseif ($step == '9') { $step = '3'; - /* pathcheck - send to installpaths */ + /* settingscheck - send to settings-install */ } elseif ($step == '4') { $step = '5'; - /* installpaths - send to templates */ + /* settings-install - send to template-import */ } elseif ($step == '5') { $step = '6'; - /* templates - send to install and finalize */ + /* template-import - send to installfinal */ } elseif ($step == '6') { $step = '7'; } @@ -556,7 +556,7 @@ function install_file_paths () { -/* install and finalize - Install templates, change cacti version and send to login page */ +/* installfinal - Install templates, change cacti version and send to login page */ if ($step == '7') { include_once('../lib/data_query.php'); include_once('../lib/utility.php'); @@ -613,7 +613,7 @@ function install_file_paths () { - /* upgrade */ +/* upgrade */ }elseif (($step == '8') && ($_REQUEST['install_type'] == '3')) { /* if the version is not found, die */ if (!is_int($old_version_index)) { @@ -741,7 +741,7 @@ function install_file_paths () { cacti - include/themes/classic/main.css' type='text/css' rel='stylesheet'> + include/themes/modern/main.css' type='text/css' rel='stylesheet'>