From 79a1a211955bd72e0d2ae2830b9829ecdeddc0c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E4=B8=AD=E7=A3=90=E7=9F=B3?= <qqqq2900@126.com>
Date: Thu, 1 Aug 2024 11:03:39 +0800
Subject: [PATCH] no commit message

---
 webmain/install/installAction.php | 23 +++++++++++++++--------
 webmain/install/tpl_install.html  |  4 ++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/webmain/install/installAction.php b/webmain/install/installAction.php
index 18ab7dd..779c0a6 100644
--- a/webmain/install/installAction.php
+++ b/webmain/install/installAction.php
@@ -4,7 +4,7 @@ class installClassAction extends ActionNot{
 	
 	public function initAction()
 	{
-		if(getconfig('systype')=='demo')exit('');
+		if(getconfig('systype')=='demo' || getconfig('install'))exit('');
 	}
 	
 	public function defaultAction()
@@ -43,6 +43,11 @@ class installClassAction extends ActionNot{
 		$this->rmdirs($dir);
 	}
 	
+	private function isbasecz($db, $base){
+		$dbrows = $db->getall("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$base'");
+		return $dbrows;
+	}
+	
 	public function saveAjax()
 	{
 		$dbtype 	= $this->post('dbtype');
@@ -77,19 +82,21 @@ class installClassAction extends ActionNot{
 		$msg = $db1->errormsg;
 		if(!$this->isempt($msg))exit('数据库用户名/密码有误:'.$msg.'');
 		
+		if(!$this->isbasecz($db1, $base)){
+			if($user=='root'){
+				$db1->query("CREATE DATABASE `$base` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci");
+				if(!$this->isbasecz($db1, $base))exit('无法创建数据库:'.$base.'，请自己手动创建');
+			}else{
+				exit('数据库'.$base.'不存在，因为非root帐号，请自己手动创建');
+			}
+		}
 		
 		//2
 		$db 		= import($dbtype);
 		$db->changeattr($host, $user, $pass, $base);
 		$db->connectdb();
 		$msg = $db->errormsg;
-		if(!$this->isempt($msg)){
-			$db1->query("CREATE DATABASE `$base` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci");
-		}
-		
-		$db->connectdb();
-		$msg = $db->errormsg;
-		if(!$this->isempt($msg))exit('无法创建数据库:'.$msg.'');
+		if(!$this->isempt($msg))exit('数据库错误:'.$msg.'');
 		
 		
 		$dburl 	= ROOT_PATH.'/'.PROJECT.'/install/rockxinhu.sql';
diff --git a/webmain/install/tpl_install.html b/webmain/install/tpl_install.html
index 206022a..e77896f 100644
--- a/webmain/install/tpl_install.html
+++ b/webmain/install/tpl_install.html
@@ -32,7 +32,7 @@
 				<div align="center" style="text-align:center;padding-top:15px"><input class="webbtn" onclick="nextabc()" disabled id="zhidbtns" value="我知道了" style="border-radius:5px" type="button"> &nbsp;<a target="_blank" href="<?=URLY?>view_anzz.html" class="blue" ></a></div>
 			</div>
 			<div id="step2" style="display:none">
-			<form name="myform">
+			<form name="myform" autocomplete="off">
 			<table width="100%">
 				<tr><td  colspan="2" height="40" align="center"><font color=#888888>数据库采用是<font color=red>mysql</font>，请先配置好本地</font></td></tr>
 				
@@ -145,7 +145,7 @@ function restimes(sj){
 	o.disabled=true;
 	setTimeout('restimes('+(sj-1)+')',1000);
 }
-restimes(10);
+restimes(3);
 </script>
 
 </body>