diff --git a/function/normal.php b/function/normal.php index e6bf1e897a0a49e3dfd82e16346c7b2b7a02c161..e970fe0b0adf474b05ea5c500a717713d896d6d7 100644 --- a/function/normal.php +++ b/function/normal.php @@ -115,7 +115,7 @@ function setConfig($arr, $disktag = '') function install() { global $constStr; - if ($_GET['install1']) { + if ($_GET['install2']) { if ($_POST['admin']!='') { $tmp['admin'] = $_POST['admin']; $tmp['language'] = $_POST['language']; @@ -129,27 +129,70 @@ function install() } } } - if ($_GET['install0']) { + if ($_GET['install1']) { if (!ConfigWriteable()) { $html .= getconstStr('MakesuerWriteable'); $title = 'Error'; return message($html, $title, 201); } - if (!RewriteEngineOn()) { + /*if (!RewriteEngineOn()) { $html .= getconstStr('MakesuerRewriteOn'); $title = 'Error'; return message($html, $title, 201); + }*/ + $html .= ' + + '; + $title = getconstStr('SetAdminPassword'); + return message($html, $title, 201); + } + if ($_GET['install0']) { $html .= ' -
+ language:
'; foreach ($constStr['languages'] as $key1 => $value1) { $html .= '
'; } $html .= ' -
'; - $html .= '
'; $title = getconstStr('SelectLanguage'); return message($html, $title, 201);