Use Sqlite and does not support Mysql any more

Application/Home/Controller/ItemController.class.php

@@ -105,7 +105,6 @@ class ItemController extends BaseController {
         $current_page_id = I("page_id/d");
         //判断个性域名
         if ($item_domain) {
-            $item_domain = mysql_escape_string($item_domain);
             $item = D("Item")->where("item_domain = '$item_domain' ")->find();
             if ($item['item_id']) {
                 $item_id = $item['item_id'] ;
@@ -122,7 +121,6 @@ class ItemController extends BaseController {
 
         //是否有搜索词
         if ($keyword) {
-            $keyword = mysql_escape_string($keyword);
             $pages = D("Page")->where("item_id = '$item_id' and ( page_title like '%{$keyword}%' or page_content like '%{$keyword}%' ) ")->order(" `s_number` asc  ")->select();
         
         }else{

Application/Home/Controller/UpdateController.class.php

@@ -7,241 +7,14 @@ class UpdateController extends BaseController {
     public function db(){
         clear_runtime();
     	if (strtolower(C("DB_TYPE")) == 'mysql' ) {
-    		$this->mysql();
+    		//$this->mysql();
+            echo 'ShowDoc does not support mysql any more';
     	}
         elseif (strtolower(C("DB_TYPE")) == 'sqlite' ) {
             $this->sqlite();
         }
     	clear_runtime();
     }
-    //升级mysql数据库  
-    public function mysql(){
-
-    	//user表的username字段增大了长度，防止长邮箱的用户名注册不了
-    	$sql = "alter table ".C('DB_PREFIX')."user modify column username varchar(50) CHARACTER SET utf8 NOT NULL DEFAULT '' ";
-    	M("Catalog")->execute($sql);
-
-    	//item表增加last_update_time字段
-    	$columns = M("item")->getDbFields();
-    	if ($columns) {
-    		$has_it = 0 ;//是否存在该字段
-    		foreach ($columns as $key => $value) {
-    			if ($value == 'last_update_time') {
-    				$has_it = 1 ;
-    			}
-    		}
-    		if ($has_it === 0) {
-    			$sql = "ALTER TABLE ".C('DB_PREFIX')."item ADD last_update_time INT( 11 ) NOT NULL DEFAULT '0' COMMENT '最后更新时间';";
-    			D("Item")->execute($sql);
-    		}
-    	}
-    	
-
-    	//更改catalog表的order字段名为s_number
-    	$columns = M("Catalog")->getDbFields();
-    	if ($columns) {
-    		foreach ($columns as $key => $value) {
-    			if ($value == 'order') {
-			    	$sql = "ALTER TABLE  `".C('DB_PREFIX')."catalog` CHANGE  `order`  `s_number` INT( 10 ) NOT NULL DEFAULT  '99' COMMENT  '顺序号。数字越小越靠前。若此值全部相等时则按id排序';";
-			    	M("Catalog")->execute($sql);
-    			}
-    		}
-    	}
-
-    	//更改page表的order字段名为s_number
-    	$columns = M("Page")->getDbFields();
-    	if ($columns) {
-    		foreach ($columns as $key => $value) {
-    			if ($value == 'order') {
-			    	$sql = "ALTER TABLE  `".C('DB_PREFIX')."page` CHANGE  `order`  `s_number` INT( 10 ) NOT NULL DEFAULT  '99' COMMENT  '顺序号。数字越小越靠前。若此值全部相等时则按id排序';";
-			    	M("Page")->execute($sql);
-    			}
-    		}
-    	}
-
-    	//更改page_history表的order字段名为s_number
-    	$columns = M("PageHistory")->getDbFields();
-    	if ($columns) {
-    		foreach ($columns as $key => $value) {
-    			if ($value == 'order') {
-			    	$sql = "ALTER TABLE  `".C('DB_PREFIX')."page_history` CHANGE  `order`  `s_number` INT( 10 ) NOT NULL DEFAULT  '99' COMMENT  '顺序号。数字越小越靠前。若此值全部相等时则按id排序';";
-			    	M("PageHistory")->execute($sql);
-    			}
-    		}
-    	}
-
-    	//为catalog表增加addtime索引
-    	$indexs = M("Catalog")->query(" show index from ".C('DB_PREFIX')."catalog");
-    	if ($indexs) {
-    		$has_it = 0 ;//是否存在该索引
-    		foreach ($indexs as $key => $value) {
-    			if ($value['column_name'] =='addtime') {
-    				$has_it = 1 ;
-    			}
-    		}
-    		if ($has_it === 0 ) {
-    			M("Catalog")->execute("ALTER TABLE ".C('DB_PREFIX')."catalog ADD INDEX ( `addtime` ) ;");
-    		}
-    	}
-
-    	//为item表增加addtime索引
-    	$indexs = M("Item")->query(" show index from ".C('DB_PREFIX')."item");
-    	if ($indexs) {
-    		$has_it = 0 ;//是否存在该索引
-    		foreach ($indexs as $key => $value) {
-    			if ($value['column_name'] =='addtime') {
-    				$has_it = 1 ;
-    			}
-    		}
-    		if ($has_it === 0 ) {
-    			M("Item")->execute("ALTER TABLE ".C('DB_PREFIX')."item ADD INDEX ( `addtime` ) ;");
-    		}
-    	}
-
-    	//为page表增加addtime索引
-    	$indexs = M("Page")->query(" show index from ".C('DB_PREFIX')."page");
-    	if ($indexs) {
-    		$has_it = 0 ;//是否存在该索引
-    		foreach ($indexs as $key => $value) {
-    			if ($value['column_name'] =='addtime') {
-    				$has_it = 1 ;
-    			}
-    		}
-    		if ($has_it === 0 ) {
-    			M("page")->execute("ALTER TABLE ".C('DB_PREFIX')."page ADD INDEX ( `addtime` ) ;");
-    		}
-    	}
-
-    	//为page_history表增加addtime索引
-    	$indexs = M("PageHistory")->query(" show index from ".C('DB_PREFIX')."page_history");
-    	if ($indexs) {
-    		$has_it = 0 ;//是否存在该索引
-    		foreach ($indexs as $key => $value) {
-    			if ($value['column_name'] =='addtime') {
-    				$has_it = 1 ;
-    			}
-    		}
-    		if ($has_it === 0 ) {
-    			M("PageHistory")->execute("ALTER TABLE ".C('DB_PREFIX')."page_history ADD INDEX ( `addtime` ) ;");
-    		}
-    	}
-
-    	//为page_history表增加page_id索引
-    	$indexs = M("PageHistory")->query(" show index from ".C('DB_PREFIX')."page_history");
-    	if ($indexs) {
-    		$has_it = 0 ;//是否存在该索引
-    		foreach ($indexs as $key => $value) {
-    			if ($value['column_name'] =='page_id') {
-    				$has_it = 1 ;
-    			}
-    		}
-    		if ($has_it === 0 ) {
-    			M("PageHistory")->execute("ALTER TABLE ".C('DB_PREFIX')."page_history ADD INDEX ( `page_id` ) ;");
-    		}
-    	}
-
-
-        //catalog表增加parent_cat_id字段
-        $columns = M("catalog")->getDbFields();
-        if ($columns) {
-            $has_it = 0 ;//是否存在该字段
-            foreach ($columns as $key => $value) {
-                if ($value == 'parent_cat_id') {
-                    $has_it = 1 ;
-                }
-            }
-            if ($has_it === 0) {
-                $sql = "ALTER TABLE ".C('DB_PREFIX')."catalog ADD parent_cat_id INT( 10 ) NOT NULL DEFAULT '0' COMMENT '上一级目录的id';";
-                D("catalog")->execute($sql);
-            }
-        }
-
-        //catalog表增加level字段
-        $columns = M("catalog")->getDbFields();
-        if ($columns) {
-            $has_it = 0 ;//是否存在该字段
-            foreach ($columns as $key => $value) {
-                if ($value == 'level') {
-                    $has_it = 1 ;
-                }
-            }
-            if ($has_it === 0) {
-                $sql = "ALTER TABLE ".C('DB_PREFIX')."catalog ADD level INT( 10 ) NOT NULL DEFAULT '2' COMMENT '2为二级目录，3为三级目录';";
-                D("catalog")->execute($sql);
-            }
-        }
-        //item表增加item_domain字段
-        $columns = M("item")->getDbFields();
-        if ($columns) {
-            $has_it = 0 ;//是否存在该字段
-            foreach ($columns as $key => $value) {
-                if ($value == 'item_domain') {
-                    $has_it = 1 ;
-                }
-            }
-            if ($has_it === 0) {
-                $sql = "ALTER TABLE ".C('DB_PREFIX')."item ADD item_domain varchar( 50 ) NOT NULL DEFAULT '' COMMENT 'item的个性域名';";
-                D("item")->execute($sql);
-            }
-        }
-
-        $sql = "CREATE TABLE IF NOT EXISTS `".C('DB_PREFIX')."user_token` (
-        `id` int(10) NOT NULL AUTO_INCREMENT,
-        `uid` int(10) NOT NULL DEFAULT '0',
-        `token` varchar(200) NOT NULL DEFAULT '',
-        `token_expire` int(11) NOT NULL DEFAULT '0' ,
-        `ip` varchar(200) NOT NULL DEFAULT '',
-        `addtime` int(11) NOT NULL DEFAULT '0',
-        PRIMARY KEY (`id`),
-        KEY `token` (`token`)
-        ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='' AUTO_INCREMENT=1 ";
-        D("User")->execute($sql);
-
-        //创建template表
-        $sql = "CREATE TABLE IF NOT EXISTS `".C('DB_PREFIX')."template` (
-        `id` int(10) NOT NULL AUTO_INCREMENT,
-        `uid` int(10) NOT NULL DEFAULT '0',
-        `username` varchar(200) NOT NULL DEFAULT '',
-        `template_title` varchar(200) NOT NULL DEFAULT '' ,
-        `template_content` text NOT NULL ,
-        `addtime` int(11) NOT NULL DEFAULT '0',
-        PRIMARY KEY (`id`),
-        KEY `uid` (`uid`)
-        )ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='' AUTO_INCREMENT=1";
-        D("UserToken")->execute($sql);
-
-        //page表增加page_comments字段
-        $columns = M("Page")->getDbFields();
-        if ($columns) {
-            $has_it = 0 ;//是否存在该字段
-            foreach ($columns as $key => $value) {
-                if ($value == 'page_comments') {
-                    $has_it = 1 ;
-                }
-            }
-            if ($has_it === 0) {
-                $sql = "ALTER TABLE ".C('DB_PREFIX')."page ADD page_comments varchar( 255 ) NOT NULL DEFAULT '' COMMENT '页面注释';";
-                D("Page")->execute($sql);
-            }
-        }
-        //page_history表增加page_comments字段
-        $columns = M("PageHistory")->getDbFields();
-        if ($columns) {
-            $has_it = 0 ;//是否存在该字段
-            foreach ($columns as $key => $value) {
-                if ($value == 'page_comments') {
-                    $has_it = 1 ;
-                }
-            }
-            if ($has_it === 0) {
-                $sql = "ALTER TABLE ".C('DB_PREFIX')."page_history ADD page_comments varchar( 255 ) NOT NULL DEFAULT '' COMMENT '页面注释';";
-                D("PageHistory")->execute($sql);
-            }
-        }
-
-        echo "OK!";
-    }
-
     public function sqlite(){
         //catalog表增加parent_cat_id字段
         $columns = M("catalog")->getDbFields();
@@ -342,6 +115,49 @@ class UpdateController extends BaseController {
         echo 'OK!';
     }
 
+    //转移mysql的数据到sqlite
+    public function toSqlite(){
+        clear_runtime();
+        if (strtolower(C("DB_TYPE")) == 'mysql' ) {
+            $this->_moveTable("catalog");
+            $this->_moveTable("item");
+            $this->_moveTable("item_member");
+            $this->_moveTable("page");
+            $this->_moveTable("page_history");
+            $this->_moveTable("template");
+            $this->_moveTable("user");
+            $this->_moveTable("user_token");
+            $db_config = array(
+                'DB_TYPE'   => 'Sqlite', 
+                'DB_NAME'   => 'Sqlite/showdoc.db.php', 
+                );
+            $array = M("user")->db(2,$db_config)->select();
+            if ($array) {
+                echo "ok";
+            }else{
+                echo 'fail';
+            }
+            
+        }
+        else{
+            echo "mysql not found";
+        }
+        clear_runtime();
+    }
+
+    private function _moveTable($table){
+        $db_config = array(
+            'DB_TYPE'   => 'Sqlite', 
+            'DB_NAME'   => 'Sqlite/showdoc.db.php', 
+            );
+        $array = M($table)->select();
+        if ($array) {
+            foreach ($array as $key => $value) {
+               M($table)->db(2,$db_config)->add($value);
+            }
+        }
+    }
+
 
 
 

install/ajax.php

@@ -43,7 +43,7 @@ if ($db_type == "sqlite") {
     user_sqlite();
 }
 elseif ($db_type == "mysql") {
-    user_mysql();
+    //user_mysql();
 }
 function user_sqlite(){
         clear_runtime();//清除缓存
@@ -101,226 +101,6 @@ EOD;
         }
 }
 
-function user_mysql(){
-        $db_host = $_POST["db_host"] ;
-        $db_user = $_POST["db_user"] ;
-        $db_port = $_POST["db_port"] ? $_POST["db_port"] :3306 ;
-        $db_name = $_POST["db_name"] ;
-        $db_password = $_POST["db_password"] ;
-
-        clear_runtime();//清除缓存
-
-        //检测数据库配置是否能链接得上
-
-        $con = mysqli_connect($db_host,$db_user,$db_password,$db_name,$db_port);
-        if (!$con ) {
-           ajax_out(L("db_wrong"),10002);
-           exit();
-        }
-        mysqli_query($con, "SET NAMES UTF8");
-        $row = mysqli_fetch_array(mysqli_query($con, " SELECT COUNT(*) FROM user "));
-        
-        if ($row) {
-           ajax_out(L("db_has_data"),10003);
-           exit();
-        }
-        
-        //开始导入mysql数据库 
-        $ret = import_mysql($con);
-        if (!$ret) {
-           ajax_out(L("create_table_fail"),10004);
-           exit();
-        }
-
-        write_home_config();
-
-        $config = "<?php ";
-        $config .= "
-return array(
-    //'配置项'=>'配置值'
-    //使用sqlite数据库（ShowDoc默认）
-    //'DB_TYPE'   => 'Sqlite', 
-    //'DB_NAME'   => 'Sqlite/showdoc.db.php', 
-    //使用mysql数据库
-    'DB_TYPE'   => 'mysql', 
-    'DB_NAME'   => '{$db_name}',
-    'DB_HOST'   => '{$db_host}',
-    'DB_USER'   => '{$db_user}', 
-    'DB_PWD'    => '{$db_password}',
-    'DB_PORT'   => {$db_port}, // 端口
-    'DB_PREFIX' => '', // 数据库表前缀
-    'DB_CHARSET'=> 'utf8', // 字符集
-    'DB_DEBUG'  =>  TRUE, // 数据库调试模式 开启后可以记录SQL日志
-    'URL_HTML_SUFFIX' => '',//url伪静态后缀
-    'URL_MODEL' => 3 ,//URL兼容模式
-    'URL_ROUTER_ON'   => true, 
-    'URL_ROUTE_RULES'=>array(
-        ':id\d'               => 'Home/Item/show?item_id=:1',
-		':domain\s$'               => 'Home/Item/show?item_domain=:1',//item的个性域名
-        'uid/:id\d'               => 'Home/Item/showByUid?uid=:1',
-    ),
-    'URL_CASE_INSENSITIVE'=>true,
-    'SHOW_ERROR_MSG'        =>  true,    // 显示错误信息，这样在部署模式下也能显示错误
-    'STATS_CODE' =>'',  //可选，统计代码
-    //上传文件到七牛的配置
-    'UPLOAD_SITEIMG_QINIU' => array(
-                    'maxSize' => 5 * 1024 * 1024,//文件大小
-                    'rootPath' => './',
-                    'saveName' => array ('uniqid', ''),
-                    'driver' => 'Qiniu',
-                    'driverConfig' => array (
-                            'secrectKey' => '', 
-                            'accessKey' => '',
-                            'domain' => '',
-                            'bucket' => '', 
-                        )
-                    ),
-);";
-        $ret = file_put_contents("../Application/Common/Conf/config.php", $config);
-
-
-        if ($ret) {
-        	file_put_contents("./install.lock","http://www.showdoc.cc/");
-            ajax_out(L("install_success"));
-        }else{
-            ajax_out(L("install_config_not_writable"),10001);
-        }
-}
-
-function import_mysql($con){
-
-	//创建目录表
-	$sql = "CREATE TABLE IF NOT EXISTS `catalog` (
-	`cat_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '目录id',
-	`cat_name` varchar(20) NOT NULL DEFAULT '' COMMENT '目录名',
-	`item_id` int(10) NOT NULL DEFAULT '0' COMMENT '所在的项目id',
-	`s_number` int(10) NOT NULL DEFAULT '99' COMMENT '顺序号。数字越小越靠前。若此值全部相等时则按id排序',
-	`addtime` int(11) NOT NULL DEFAULT '0',
-	`parent_cat_id` int(10) NOT NULL DEFAULT '0' COMMENT '上一级目录的id',
-	`level` int(10) NOT NULL DEFAULT '2' COMMENT '2为二级目录，3为三级目录',
-	PRIMARY KEY (`cat_id`),
-	KEY `addtime` (`addtime`),
-	KEY `s_number` (`s_number`)
-	) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='目录表' AUTO_INCREMENT=1 ";
-	mysqli_query($con, $sql);
-
-	//创建item表
-	$sql = "CREATE TABLE IF NOT EXISTS `item` (
-	`item_id` int(10) NOT NULL AUTO_INCREMENT,
-	`item_name` varchar(50) NOT NULL DEFAULT '',
-	`item_description` varchar(225) NOT NULL DEFAULT '' COMMENT '项目描述',
-	`uid` int(10) NOT NULL DEFAULT '0',
-	`username` varchar(50) NOT NULL DEFAULT '',
-	`password` varchar(50) NOT NULL DEFAULT '',
-	`item_domain` varchar(50) NOT NULL DEFAULT '',
-	`addtime` int(11) NOT NULL DEFAULT '0',
-	`last_update_time` int(11) NOT NULL DEFAULT '0' COMMENT '最后更新时间',
-	PRIMARY KEY (`item_id`),
-	KEY `addtime` (`addtime`)
-	) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='项目表' AUTO_INCREMENT=1 ";
-	mysqli_query($con, $sql);	
-
-	//创建项目成员表
-	$sql = "CREATE TABLE IF NOT EXISTS `item_member` (
-	`item_member_id` int(10) NOT NULL AUTO_INCREMENT,
-	`item_id` int(10) NOT NULL DEFAULT '0',
-	`uid` int(10) NOT NULL DEFAULT '0',
-	`username` varchar(50) NOT NULL DEFAULT '',
-	`addtime` int(11) NOT NULL DEFAULT '0',
-	PRIMARY KEY (`item_member_id`)
-	) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='项目成员表' AUTO_INCREMENT=1 ";
-	mysqli_query($con, $sql);
-
-	//创建项目page表
-	$sql = "CREATE TABLE IF NOT EXISTS `page` (
-	`page_id` int(10) NOT NULL AUTO_INCREMENT,
-	`author_uid` int(10) NOT NULL DEFAULT '0' COMMENT '页面作者uid',
-	`author_username` varchar(50) NOT NULL DEFAULT '' COMMENT '页面作者名字',
-	`item_id` int(10) NOT NULL DEFAULT '0',
-	`cat_id` int(10) NOT NULL DEFAULT '0',
-    `page_title` varchar(50) NOT NULL DEFAULT '',
-	`page_comments` varchar(255) NOT NULL DEFAULT '',
-	`page_content` text NOT NULL,
-	`s_number` int(10) NOT NULL DEFAULT '99' COMMENT '顺序号。数字越小越靠前。若此值全部相等时则按id排序',
-	`addtime` int(11) NOT NULL DEFAULT '0',
-	PRIMARY KEY (`page_id`),
-	KEY `addtime` (`addtime`),
-	KEY `s_number` (`s_number`)
-	) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='文章页面表' AUTO_INCREMENT=1 ";
-	mysqli_query($con, $sql);
-
-	//创建项目page_history表
-	$sql = "CREATE TABLE IF NOT EXISTS `page_history` (
-	`page_history_id` int(10) NOT NULL AUTO_INCREMENT,
-	`page_id` int(10) NOT NULL DEFAULT '0',
-	`author_uid` int(10) NOT NULL DEFAULT '0' COMMENT '页面作者uid',
-	`author_username` varchar(50) NOT NULL DEFAULT '' COMMENT '页面作者名字',
-	`item_id` int(10) NOT NULL DEFAULT '0',
-	`cat_id` int(10) NOT NULL DEFAULT '0',
-	`page_title` varchar(50) NOT NULL DEFAULT '',
-    `page_comments` varchar(255) NOT NULL DEFAULT '',
-	`page_content` text NOT NULL,
-	`s_number` int(10) NOT NULL DEFAULT '99' COMMENT '顺序号。数字越小越靠前。若此值全部相等时则按id排序',
-	`addtime` int(11) NOT NULL DEFAULT '0',
-	PRIMARY KEY (`page_history_id`),
-	KEY `addtime` (`addtime`),
-	KEY `page_id` (`page_id`)
-	) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='页面历史表' AUTO_INCREMENT=1 ";
-	mysqli_query($con, $sql);
-
-    //创建user_token表
-    $sql = "CREATE TABLE IF NOT EXISTS `user_token` (
-    `id` int(10) NOT NULL AUTO_INCREMENT,
-    `uid` int(10) NOT NULL DEFAULT '0',
-    `token` varchar(200) NOT NULL DEFAULT '',
-    `token_expire` int(11) NOT NULL DEFAULT '0' ,
-    `ip` varchar(200) NOT NULL DEFAULT '',
-    `addtime` int(11) NOT NULL DEFAULT '0',
-    PRIMARY KEY (`id`),
-    KEY `token` (`token`)
-    ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='' AUTO_INCREMENT=1 ";
-    mysqli_query($con, $sql);
-
-    //创建template表
-    $sql = "CREATE TABLE IF NOT EXISTS `template` (
-    `id` int(10) NOT NULL AUTO_INCREMENT,
-    `uid` int(10) NOT NULL DEFAULT '0',
-    `username` varchar(200) NOT NULL DEFAULT '',
-    `template_title` varchar(200) NOT NULL DEFAULT '' ,
-    `template_content` text NOT NULL ,
-    `addtime` int(11) NOT NULL DEFAULT '0',
-    PRIMARY KEY (`id`),
-    KEY `uid` (`uid`)
-    )ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='' AUTO_INCREMENT=1";
-    mysqli_query($con, $sql);
-
-	//创建项目user表
-	$sql = "CREATE TABLE IF NOT EXISTS `user` (
-	`uid` int(10) NOT NULL AUTO_INCREMENT,
-	`username` varchar(50) CHARACTER SET utf8 NOT NULL DEFAULT '',
-	`groupid` tinyint(2) NOT NULL DEFAULT '2' COMMENT '1为超级管理员，2为普通用户',
-	`name` varchar(15) CHARACTER SET utf8 DEFAULT '',
-	`avatar` varchar(200) CHARACTER SET utf8 DEFAULT '' COMMENT '头像',
-	`avatar_small` varchar(200) DEFAULT '',
-	`email` varchar(50) CHARACTER SET utf8 DEFAULT '',
-	`password` varchar(50) CHARACTER SET utf8 NOT NULL,
-	`cookie_token` varchar(50) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '实现cookie自动登录的token凭证',
-	`cookie_token_expire` int(11) NOT NULL DEFAULT '0',
-	`reg_time` int(11) NOT NULL DEFAULT '0',
-	`last_login_time` int(11) NOT NULL DEFAULT '0',
-	PRIMARY KEY (`uid`),
-	UNIQUE KEY `username` (`username`) USING BTREE
-	) ENGINE=MyISAM  DEFAULT CHARSET=latin1 COMMENT='用户表' AUTO_INCREMENT=1 ";
-
-	$ret = mysqli_query($con, $sql);
-
-	if ($ret) {
-		return true;
-	}else{
-		return false;
-	}
-
-}
 
 function write_home_config(){
 	$lang = $_REQUEST['lang'] ? $_REQUEST['lang'] :"zh";

install/database.php

@@ -58,11 +58,6 @@ if(!extension_loaded("mbstring")){
 }
 
 
-if(!extension_loaded("mysql")){
-  echo '请安装php-mysql<br>';
-  $go = 0;
-}
-
 if(!extension_loaded("PDO") && !extension_loaded("pdo") ){
   echo '请安装php-pdo<br>';
   $go = 0;
@@ -96,6 +91,9 @@ if (!$go) {
 	body {
 		font:14px/1.5 "Microsoft Yahei","微软雅黑",Tahoma,Arial,Helvetica,STHeiti;
 	}
+  .form-signin{
+    display: none;
+  }
     </style>
 
   </head>
@@ -151,33 +149,45 @@ if (!$go) {
  		};
  	});
 
- 	$("#start").click(function(){
- 		var db_type = $("#db_type").val();
- 		var db_host = $("#db_host").val();
- 		var db_port = $("#db_port").val();
- 		var db_name = $("#db_name").val();
+
+
+  function install(){
+    var db_type = $("#db_type").val();
+    var db_host = $("#db_host").val();
+    var db_port = $("#db_port").val();
+    var db_name = $("#db_name").val();
     var db_user = $("#db_user").val();
- 		var lang = $("#lang").val();
- 		var db_password = $("#db_password").val();
- 		$.post(
- 			'ajax.php',
- 			{"lang":lang,"db_type":db_type,"db_host":db_host,"db_port":db_port,"db_name":db_name,"db_user":db_user,"db_password":db_password},
- 			function(data){
- 				if (data.error_code === 0) {
- 					//安装成功
-			 		//alert(data.message);
+    var lang = $("#lang").val();
+    var db_password = $("#db_password").val();
+    $.post(
+      'ajax.php',
+      {"lang":lang,"db_type":db_type,"db_host":db_host,"db_port":db_port,"db_name":db_name,"db_user":db_user,"db_password":db_password},
+      function(data){
+        if (data.error_code === 0) {
+          //安装成功
+          //alert(data.message);
           var text = '<div><?php echo L("install_success_help");?></div><br>';
-			 		 text += '<div><a href="../" ><?php echo L("home");?></a></div>';
+           text += '<div><a href="../" ><?php echo L("home");?></a></div>';
            $(".form-signin").html(text);
- 				}else{
- 					alert(data.message);
- 				}
- 			},
- 			"json"
+             $(".form-signin").show();
 
- 			);
+        }else{
+          alert(data.message);
+        }
+      },
+      "json"
+
+      ); 
+  }
+
+  $("#start").click(function(){
+
+    install();
+    return false;
+  });
+
+  install();
 
- 		return false;
- 	});
  });
+
 </script>