From e0f56d36413ea1606ae57587f29d3da7ad9eb6e5 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 18 Jul 2015 19:17:56 -0700 Subject: [PATCH] Install routine now using bootstrap3 theme. --- e107_admin/update_routines.php | 6 +- install.php | 106 ++++++++++++++++++--------------- 2 files changed, 62 insertions(+), 50 deletions(-) diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index 3203564ee..bbeda9937 100644 --- a/e107_admin/update_routines.php +++ b/e107_admin/update_routines.php @@ -1375,8 +1375,10 @@ function update_706_to_800($type='') // e107::getSingleton('e107plugin')->install('download',array('nolinks'=>true)); e107::getSingleton('e107plugin')->refresh('download'); } - - if (!e107::isInstalled('banner') && $sql->gen("SELECT * FROM #banner LIMIT 1")) + + + + if (!e107::isInstalled('banner') && $sql->isTable('banner')) { if ($just_check) return update_needed('Banner Table found, but plugin not installed. Needs to be refreshed.'); e107::getSingleton('e107plugin')->refresh('banner'); diff --git a/install.php b/install.php index 1740c8410..115802d66 100644 --- a/install.php +++ b/install.php @@ -295,7 +295,7 @@ class e_install { // $this->form .= "« ".LAN_BACK." "; $prevStage = ($this->stage - 1); - $e_forms->form .= " "; + $e_forms->form .= " "; } if($id != 'back') { @@ -404,11 +404,13 @@ class e_install $this->add_button("start", LAN_CONTINUE); $output = "
-
+
\n -


\n +
\n +
".$e_forms->return_form()." +

"; $this->template->SetTag("stage_content", $output); $this->logLine('Stage 1 completed'); @@ -444,11 +446,11 @@ class e_install $output = "
- +
@@ -456,7 +458,7 @@ class e_install @@ -464,7 +466,7 @@ class e_install @@ -472,8 +474,8 @@ class e_install @@ -481,7 +483,7 @@ class e_install @@ -577,19 +579,19 @@ class e_install
- + ".LANINS_030."
- + ".LANINS_031."
- + ".LANINS_032."
- - + + ".LANINS_033."
- + ".LANINS_034."
- + - + - + @@ -636,7 +638,7 @@ class e_install { $success = false; $e_forms->start_form("versions", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : "")); - $head = str_replace('[x]', ''.$this->previous_steps['mysql']['db'].'', LANINS_127); + $head = str_replace('[x]', ''.$this->previous_steps['mysql']['db'].'', "
". LANINS_127."
"); $alertType = 'error'; $this->add_button('overwritedb', LANINS_128); /* $e_forms->add_plain_html(" @@ -652,7 +654,7 @@ class e_install else { $e_forms->start_form("versions", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : "")); - $page_content = " ".LANINS_042; + $page_content = " ".LANINS_042; // @TODO Check database version here? /* $mysql_note = mysql_get_server_info(); @@ -668,7 +670,7 @@ class e_install { if($this->dbqry('DROP DATABASE `'.$this->previous_steps['mysql']['db'].'` ')) { - $page_content .= "
Deleted existing database"; + $page_content .= "
Deleted existing database"; } else { @@ -680,13 +682,13 @@ class e_install if($this->previous_steps['mysql']['createdb'] == 1) { - $notification = "
".LANINS_044; + $notification = "
".LANINS_044; $query = 'CREATE DATABASE `'.$this->previous_steps['mysql']['db'].'` CHARACTER SET `utf8` '; } else { - $notification = "
Found existing database"; + $notification = "
Found existing database"; $query = 'ALTER DATABASE `'.$this->previous_steps['mysql']['db'].'` CHARACTER SET `utf8` '; } @@ -772,13 +774,13 @@ class e_install { // Must start from an empty e107_config.php $perms_pass = FALSE; $perms_errors = LANINS_121; - $perms_notes = " ".LANINS_122; + $perms_notes = " ".LANINS_122; } else { $perms_pass = true; $perms_errors = " "; - $perms_notes = " ".LANINS_017; + $perms_notes = " ".LANINS_017; } if(!function_exists("mysql_connect")) @@ -797,12 +799,12 @@ class e_install $mysql_note = mysql_get_server_info(); if (version_compare($mysql_note, MIN_MYSQL_VERSION, '>=')) { - $mysql_help = " ".LANINS_017; + $mysql_help = " ".LANINS_017; $mysql_pass = true; } else { - $mysql_help = " ".LANINS_105; + $mysql_help = " ".LANINS_105; } } if(!function_exists('utf8_encode')) @@ -817,11 +819,11 @@ class e_install $php_version = phpversion(); if(version_compare($php_version, MIN_PHP_VERSION, ">=")) { - $php_help = " ".LANINS_017; + $php_help = " ".LANINS_017; } else { - $php_help = " ".LANINS_019; + $php_help = " ".LANINS_019; } $e_forms->start_form("versions", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : "")); if(!$perms_pass) @@ -840,7 +842,7 @@ class e_install $mysqlColor = ($mysql_pass == true) ? "text-success" : "text-error"; $output = " -
".LANINS_030."
".LANINS_031."
".LANINS_032."
+
@@ -862,7 +864,7 @@ class e_install - +
".LANINS_014." {$perms_errors}
".LANINS_050." ".($xml_installed ? LANINS_051 : LANINS_052)."".($xml_installed ? " ".LANINS_017 : LANINS_053)."".($xml_installed ? " ".LANINS_017 : LANINS_053)."
\n"; $this->finish_form(); @@ -896,11 +898,11 @@ class e_install $e_forms->start_form("admin_info", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : "")); $output = "
- +
@@ -908,7 +910,7 @@ class e_install @@ -916,7 +918,7 @@ class e_install @@ -924,7 +926,7 @@ class e_install @@ -932,7 +934,7 @@ class e_install @@ -1039,14 +1041,14 @@ class e_install -
- previous_steps['admin']['user'] : "")."' maxlength='60' /> + previous_steps['admin']['user'] : "")."' maxlength='60' /> ".LANINS_073."
- previous_steps['admin']['display'] : "")."' maxlength='60' /> + previous_steps['admin']['display'] : "")."' maxlength='60' /> ".LANINS_123."
- + ".LANINS_124."
- + ".LANINS_079."
- previous_steps['admin']['email'] : '')."' maxlength='100' /> + previous_steps['admin']['email'] : '')."' maxlength='100' /> ".LANINS_081."
- +
- +
+ @@ -1073,7 +1075,7 @@ class e_install $output .= " "; @@ -1287,8 +1289,7 @@ class e_install if($htaccessError) { - - $page .= "

".$htaccessError."

"; + $page .= "
".$htaccessError; } $this->add_button('submit', LAN_CONTINUE); } @@ -1823,7 +1824,7 @@ class e_forms function add_select_item($id, $labels, $selected) { $this->form .= " - \n"; foreach ($labels as $label) { $this->form .= "{$label}\n"; @@ -1971,8 +1972,8 @@ function template_data() {installation_heading} :: {stage_pre}{stage_num} - {stage_title} - - + +
".LANINS_115."
- + {$category}