@@ -383,8 +414,11 @@ class e_install
global $e_forms;
$this->stage = 2;
$this->logLine('Stage 2 started');
- $this->previous_steps['language'] = $_POST['language'];
-
+
+ if(!empty($_POST['language']))
+ {
+ $this->previous_steps['language'] = $_POST['language'];
+ }
$this->template->SetTag("installation_heading", LANINS_001);
$this->template->SetTag("stage_pre", LANINS_002);
$this->template->SetTag("stage_num", LANINS_021);
@@ -417,7 +451,7 @@ class e_install
|
-
+
".LANINS_031."
|
@@ -425,7 +459,7 @@ class e_install
|
-
+
".LANINS_032."
|
@@ -453,7 +487,7 @@ class e_install
$e_forms->add_plain_html($output);
$this->finish_form();
- $e_forms->add_button("submit", LANINS_035);
+ $this->add_button("submit", LANINS_035);
$this->template->SetTag("stage_content", $page_info.$e_forms->return_form());
$this->logLine('Stage 2 completed');
}
@@ -466,7 +500,7 @@ class e_install
*/
private function updatePaths()
{
- $hash = e107::makeSiteHash($this->previous_steps['mysql']['db'],$this->previous_steps['mysql']['prefix']);
+ $hash = $this->e107->makeSiteHash($this->previous_steps['mysql']['db'],$this->previous_steps['mysql']['prefix']);
$this->e107->site_path = $hash;
$this->previous_steps['paths']['hash'] = $hash;
@@ -488,12 +522,7 @@ class e_install
private function stage_3()
{
-
- if(!empty($_POST['back']))
- {
- return $this->stage_2();
- }
-
+
global $e_forms;
$success = TRUE;
$this->stage = 3;
@@ -580,7 +609,7 @@ class e_install
\n";
$e_forms->add_plain_html($output);
- $e_forms->add_button("submit", LANINS_035);
+ $this->add_button("submit", LANINS_035);
$this->template->SetTag("stage_title", LANINS_040);
}
else
@@ -599,12 +628,12 @@ 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);
- $alertType = 'error';
- $e_forms->add_plain_html("
-
+ $alertType = 'error';
+ $this->add_button('overwritedb', LANINS_128);
+ /* $e_forms->add_plain_html("
"
- );
+ );*/
$this->finish_form(3);
$this->template->SetTag("stage_content", "
".$head."
".$e_forms->return_form());
@@ -667,13 +696,13 @@ class e_install
{
$e_forms->start_form("versions", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : ""));
// $page_content .= "
".LANINS_045."
";
- $e_forms->add_button("submit", LANINS_035);
+ $this->add_button("submit", LANINS_035);
$alertType = 'success';
}
else
{
- $e_forms->add_button("back", LANINS_035);
+ $this->add_button("back", LANINS_035);
}
$head = $page_content;
}
@@ -780,12 +809,12 @@ class e_install
$e_forms->start_form("versions", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : ""));
if(!$perms_pass)
{
- $e_forms->add_button("retest_perms", LANINS_009);
+ $this->add_button("retest_perms", LANINS_009);
$this->stage = 3; // make the installer jump back a step
}
elseif ($perms_pass && !$version_fail && $xml_installed)
{
- $e_forms->add_button("continue_install", LANINS_020);
+ $this->add_button("continue_install", LANINS_020);
}
$permColor = ($perms_pass == true) ? "text-success" : "text-error";
@@ -896,7 +925,7 @@ class e_install
\n";
$e_forms->add_plain_html($output);
$this->finish_form();
- $e_forms->add_button("submit", LANINS_035);
+ $this->add_button("submit", LANINS_035);
$this->template->SetTag("stage_content", $e_forms->return_form());
$this->logLine('Stage 5 completed');
}
@@ -1060,7 +1089,7 @@ class e_install
\n";
$e_forms->add_plain_html($output);
$this->finish_form();
- $e_forms->add_button("submit", LANINS_035);
+ $this->add_button("submit", LANINS_035);
$this->template->SetTag("stage_content", $e_forms->return_form());
$this->logLine('Stage 6 completed');
}
@@ -1180,7 +1209,7 @@ class e_install
$e_forms->start_form("confirmation", $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] == "debug" ? "?debug" : ""));
$page = '
'.nl2br(LANINS_057).'
';
$this->finish_form();
- $e_forms->add_button("submit", LANINS_035);
+ $this->add_button("submit", LANINS_035);
$this->template->SetTag("stage_content", $page.$e_forms->return_form());
$this->logLine('Stage 7 completed');
@@ -1240,7 +1269,7 @@ class e_install
$page .= "
".$htaccessError."
";
}
- $e_forms->add_button('submit', LANINS_035);
+ $this->add_button('submit', LANINS_035);
}
$this->finish_form();
@@ -1434,6 +1463,11 @@ class e_install
$qry = "REPLACE INTO {$this->previous_steps['mysql']['prefix']}user VALUES ({$userp})";
$this->dbqry("REPLACE INTO {$this->previous_steps['mysql']['prefix']}user VALUES ({$userp})" );
$this->logLine('Admin user created');
+
+ // Add Default user-extended values;
+ $extendedQuery = "REPLACE INTO `{$this->previous_steps['mysql']['prefix']}user_extended` (`user_extended_id` , `user_hidden_fields`) VALUES ('1', NULL );";
+ $this->dbqry($extendedQuery);
+
mysql_close($this->dbLink);
e107::getMessage()->reset(false, false, true);
@@ -1761,22 +1795,7 @@ class e_forms
$this->form .= "\n";
}
-
- function add_button($id, $title, $align = "right", $type = "submit")
- {
- $this->form .= "
\n";
- }
function add_hidden_data($id, $data)
{
@@ -1979,21 +1998,25 @@ function template_data()
$("input,textarea,select,label,.e-tip").each(function(c) {
- var t = $(this).nextAll(".field-help");
- t.hide();
+ var t = $(this).nextAll(".field-help");
+ t.hide();
- $(this).tooltip({
- title: function() {
- var tip = t.html();
- return tip;
- },
- fade: true,
- html: true,
- placement: "right",
- delay: { show: 200, hide: 200 }
+ $(this).tooltip({
+ title: function() {
+ var tip = t.html();
+ return tip;
+ },
+ fade: true,
+ html: true,
+ placement: "right",
+ delay: { show: 200, hide: 200 }
+ });
+ });
+
+ // disable validation for back-button.
+ $(".no-validate").click(function () {
+ $("form").attr( "novalidate",true );
});
-
- });
});