From 9aac12cfc8212e3b0bb573ba25eab4a38233566e Mon Sep 17 00:00:00 2001
From: KasuganoSoras <kasuganosora@tcotp.cn>
Date: Sat, 15 Sep 2018 02:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E8=A3=85=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复安装程序的一些问题
---
 index.php                    |  2 +-
 install/index.php            | 50 ++++++++++++++++++++++++++----------
 install/template/3.html      |  4 +--
 install/template/locked.html |  3 +++
 4 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/index.php b/index.php
index 132dabb..a26002c 100644
--- a/index.php
+++ b/index.php
@@ -5,7 +5,7 @@ $pathinfo = pathinfo($_SERVER['PHP_SELF']);
 $path = str_replace("/" . $pathinfo['basename'], "", $_SERVER['PHP_SELF']);
 define("ROOT", str_replace("\\", "/", __DIR__));
 define("DOCROOT", $path);
-if(!file_exists(ROOT . "/include/data/config.php")) {
+if(!file_exists(ROOT . "/include/data/config.php") && !isset($_GET['installed'])) {
 	echo "<script>location='install/';</script>";
 	exit;
 }
diff --git a/install/index.php b/install/index.php
index f73b346..b927893 100644
--- a/install/index.php
+++ b/install/index.php
@@ -1,17 +1,11 @@
 <?php
-if(file_exists("install.lock")) {
-	echo file_get_contents("template/locked.html");
-	exit;
-}
-if($_GET['step'] == '') {
-	echo file_get_contents("template/1.html");
-	exit;
-}
-if($_GET['step'] == '2') {
-	echo file_get_contents("template/2.html");
-	exit;
-}
-if($_GET['step'] == '3') {
+/**
+ *
+ * PHPMC 7 Install
+ *
+ */
+error_reporting(E_ALL);
+function install() {
 	$db_host = $_POST['db_host'];
 	$db_port = $_POST['db_port'];
 	$db_user = $_POST['db_user'];
@@ -145,6 +139,34 @@ class Config {
 	}
 }');
 	@file_put_contents("install.lock", "");
-	echo file_get_contents("template/3.html");
+}
+
+if(file_exists("install.lock")) {
+	echo @file_get_contents("template/locked.html");
+	exit;
+}
+
+if(isset($_GET['step'])) {
+	switch($_GET['step']) {
+		case '1':
+			echo @file_get_contents("template/1.html");
+			break;
+		case '2':
+			echo @file_get_contents("template/2.html");
+			break;
+		case '3':
+			install();
+			$type = $_SERVER['SERVER_PORT'] == 443 ? "https://" : "http://";
+			$self = str_replace("index.php", "?installed=true", str_replace("install/", "", $_SERVER['PHP_SELF']));
+			$connect = "{$type}{$_SERVER['HTTP_HOST']}{$self}";
+			echo str_replace("{HOME}", $connect, @file_get_contents("template/3.html"));
+			break;
+		default:
+			echo @file_get_contents("template/1.html");
+			break;
+	}
+	exit;
+} else {
+	echo @file_get_contents("template/1.html");
 	exit;
 }
\ No newline at end of file
diff --git a/install/template/3.html b/install/template/3.html
index c3fb1d1..d9d0e72 100644
--- a/install/template/3.html
+++ b/install/template/3.html
@@ -35,9 +35,7 @@
 								<div class="text-center">
 									<br>
 									<p>安装完成，立即使用。</p>
-									<a href="/">
-										<button class="btn btn-success"><i class="fa fa-send"></i> 进入后台</button>
-									</a>
+									<button class="btn btn-success" onclick="location='{HOME}'"><i class="fa fa-send"></i> 进入后台</button>
 								</div>
 							</form>
 						</div>
diff --git a/install/template/locked.html b/install/template/locked.html
index efa65c0..61c08d2 100644
--- a/install/template/locked.html
+++ b/install/template/locked.html
@@ -28,6 +28,9 @@
 							<p>PHPMC 7 官方网站：<a href="https://www.phpmc.cn/" target="_blank">https://www.phpmc.cn/</a></p>
 							<hr>
 							<p>PHPMC 7 已经安装过了，重新安装请删除 install 目录下的 install.lock</p>
+							<center>
+								<button class="btn btn-success" onclick="location='/'"><i class="fa fa-send"></i> 进入后台</button>
+							</center>
 						</div>
 					</div>
 				</div>