Merge branch 'develop'

Application/Home/Controller/UpdateController.class.php

@@ -203,7 +203,7 @@ class UpdateController extends BaseController {
         `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 DEFAULT '',
+        `template_content` text NOT NULL ,
         `addtime` int(11) NOT NULL DEFAULT '0',
         PRIMARY KEY (`id`),
         KEY `uid` (`uid`)

Application/Home/Controller/UserController.class.php

@@ -157,6 +157,7 @@ class UserController extends BaseController {
 		$login_user = $this->checkLogin();
 		session("login_user" , NULL);
 		cookie('cookie_token',NULL);
+		session(null);
 		$this->message(L('logout_succeeded'),U('Home/index/index'));
 	}
 }

Application/Home/View/Item/show.html

@@ -161,4 +161,4 @@
 <script src="__PUBLIC__/js/jquery.goup.min.js"></script>
 <script src="__PUBLIC__/js/jquery.hotkeys.js"></script>
 
-<script src="__PUBLIC__/js/item/show.js?v=1.21"></script>
+<script src="__PUBLIC__/js/item/show.js?v=1.2121"></script>

Public/js/item/show.js

@@ -107,6 +107,8 @@ $(function(){
         $(this).children("a").children('i').attr("class","icon-chevron-right");
       }
     };
+    //激活菜单
+    $(this).addClass("active");
     //获取对应的page_id
     page_id = $(this).children("a").attr("data-page-id");
     page_title = $(this).children("a")[0].innerText;

install/ajax.php

@@ -287,7 +287,7 @@ function import_mysql($con){
     `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 DEFAULT '',
+    `template_content` text NOT NULL ,
     `addtime` int(11) NOT NULL DEFAULT '0',
     PRIMARY KEY (`id`),
     KEY `uid` (`uid`)

install/database.php

@@ -7,6 +7,78 @@
 // --------
 include("common.php");
 $cur_lang = $_REQUEST['lang'] ? $_REQUEST['lang'] :"zh";
+header("Content-type: text/html; charset=utf-8"); 
+
+// 检测PHP环境
+if(version_compare(PHP_VERSION,'5.3.0','<'))  die(L('require_php_version'));
+
+if($f = file_get_contents("./install.lock")){
+  echo L("lock").'<br>';
+  exit();
+}
+
+$go = 1 ;
+
+//检测文件权限
+if(!new_is_writeable("./")){
+  echo L("not_writable_install").'<br>';
+  $go = 0;
+}
+if(!new_is_writeable("../Public/Uploads")){
+  echo L("not_writable_upload").'<br>';
+  $go = 0;
+}
+if(!new_is_writeable("../Application/Runtime")){
+  echo L("not_writable_runtime").'<br>';
+  $go = 0;
+}
+if(!new_is_writeable("../Application/Common/Conf/config.php")){
+  echo L("not_writable_config").'<br>';
+  $go = 0;
+}
+if(!new_is_writeable("../Application/Home/Conf/config.php")){
+  echo L("not_writable_home_config").'<br>';
+  $go = 0;
+}
+
+//检查扩展
+if(!extension_loaded("gd")){
+  echo '请安装php-gd<br>';
+  $go = 0;
+}
+
+if(!extension_loaded("mcrypt")){
+  echo '请安装php-mcrypt<br>';
+  $go = 0;
+}
+
+if(!extension_loaded("mbstring")){
+  echo '请安装php-mbstring<br>';
+  $go = 0;
+}
+
+
+if(!extension_loaded("mysql")){
+  echo '请安装php-mysql<br>';
+  $go = 0;
+}
+
+if(!extension_loaded("PDO") && !extension_loaded("pdo") ){
+  echo '请安装php-pdo<br>';
+  $go = 0;
+}
+
+/*if(extension_loaded("sqlite") || extension_loaded("sqlite3")){
+  echo '请安装php-sqlite<br>';
+  $go = 0;
+}
+*/
+
+if (!$go) {
+  exit();
+}
+
+
 
 ?>
 

install/lang.en.php

@@ -1,6 +1,6 @@
 <?php
 return array(
-  //index.php
+  
   "install_title"=>'Install ShowDoc',
   "use_sqlite"=>'Use Sqlite Database',
   "use_mysql"=>'Use Mysql Database',
@@ -15,7 +15,7 @@ return array(
   "home"=>'Website Home',
   "FAQ"=>'FAQ',
 
-  //ajax.php
+  
   "lock"=>'ShowDoc has been installed！If you want to reinstall,please delete file /install/install.lock ',
   "not_writable_install"=>' Directory /install is not writable !',
   "not_writable_upload"=>'Directory /Public/Uploads/  is not writable !',
@@ -31,4 +31,5 @@ return array(
   "create_table_fail"=>'Fail to create table',
   "install_config_not_writable"=>'Fail to write config file',
 
+  "require_php_version" => "require PHP > 5.3.0 ",
   );

install/lang.zh.php

@@ -1,6 +1,6 @@
 <?php
 return array(
-  //index.php
+
   "install_title"=>'安装ShowDoc',
   "use_sqlite"=>'使用Sqlite数据库',
   "use_mysql"=>'使用Mysql数据库',
@@ -15,7 +15,7 @@ return array(
   "home"=>'进入网站首页',
   "FAQ"=>'常见问题',
 
-  //ajax.php
+
   "lock"=>'本程序已经安装过！如果要解除安装锁定，则可删除/install目录下的install.lock文件后再重新访问本页面',
   "not_writable_install"=>'请赋予 /install 目录以可写权限！',
   "not_writable_upload"=>'请赋予 /Public/Uploads/ 目录以可写权限！',
@@ -31,4 +31,5 @@ return array(
   "create_table_fail"=>'创建数据库表失败！',
   "install_config_not_writable"=>'安装失败，配置文件写入错误！',
 
+  "require_php_version" => "需要PHP5.3.0以上版本",
   );