From 2b2ea121cee7b0f1cd3c44bae979dc7951d4b577 Mon Sep 17 00:00:00 2001
From: zsx <zsx@zsxsoft.com>
Date: Tue, 25 Aug 2015 18:17:59 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8Bfilesize=E4=BC=9A=E5=87=BA=E9=94=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/function/file.function.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/function/file.function.php b/lib/function/file.function.php
index 75ab376..ba3c6fe 100755
--- a/lib/function/file.function.php
+++ b/lib/function/file.function.php
@@ -50,8 +50,9 @@ function iconv_system($str){
 }
 
 function get_filesize($path){
-	return abs(sprintf("%u",filesize($path)));
-}
+	// 某些情况下filesize会出错
+	@$ret = abs(sprintf("%u",filesize($path))); 
+	return (int)$ret;}
 /**
  * 获取文件详细信息
  * 文件名从程序编码转换成系统编码,传入utf8，系统函数需要为gbk

From f08bb89474cba0da950eb699ee2e14974bd4706e Mon Sep 17 00:00:00 2001
From: zsx <zsx@zsxsoft.com>
Date: Tue, 25 Aug 2015 18:18:28 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6$info=5Flist=E6=9C=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/explorer.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controller/explorer.class.php b/controller/explorer.class.php
index c7ad34d..aa667d0 100755
--- a/controller/explorer.class.php
+++ b/controller/explorer.class.php
@@ -254,7 +254,7 @@ class explorer extends Controller{
         }
         $state = $error==0?true:false;
         $info = $success.' success,'.$error.' error';
-        if (count($info_list) == 1 && $error==0) {
+        if ($error==0) {
             $info = $this->L['remove_success'];
         }
         show_json($info,$state);

From adc2ff6030e60404d0cca54f2a37ab07dc075608 Mon Sep 17 00:00:00 2001
From: zsx <zsx@zsxsoft.com>
Date: Tue, 25 Aug 2015 18:30:55 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=B9=E5=AE=9A?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E8=BE=B9=E6=A0=8F=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/explorer.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/controller/explorer.class.php b/controller/explorer.class.php
index aa667d0..1617069 100755
--- a/controller/explorer.class.php
+++ b/controller/explorer.class.php
@@ -101,9 +101,12 @@ class explorer extends Controller{
         }
 
         //回收站不记录前进后退
-        if($this->in['path'] != '*recycle*/' && $this->in['type'] !=='desktop'){
-            $_SESSION['this_path']=$user_path;
+        if (isset($this->in['type'])){
+            if($this->in['path'] != '*recycle*/' && $this->in['type'] !=='desktop'){
+                $_SESSION['this_path']=$user_path;
+            }   
         }
+
         $list=$this->path($this->path);
         $list['history_status']= array('back'=>$hi->isback(),'next'=>$hi->isnext());
         show_json($list);

From 2f2e43578c74afe212ac5b31981ad02a24745994 Mon Sep 17 00:00:00 2001
From: zsx <zsx@zsxsoft.com>
Date: Tue, 25 Aug 2015 18:45:22 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/editor/edit.php   | 2 +-
 template/editor/editor.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/editor/edit.php b/template/editor/edit.php
index 8d71646..5ea7706 100755
--- a/template/editor/edit.php
+++ b/template/editor/edit.php
@@ -89,7 +89,7 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <script src="<?php echo STATIC_PATH;?>js/lib/ace/src-min-noconflict/ace.js?ver=<?php echo KOD_VERSION;?>"></script>
 <script src="<?php echo STATIC_PATH;?>js/lib/ace/src-min-noconflict/ext-language_tools.js?ver=<?php echo KOD_VERSION;?>"></script>
 <script type="text/javascript">
-	G.frist_file = "<?php echo $_GET['filename'];?>";
+	G.frist_file = "<?php echo (isset($_GET['filename']) ? $_GET['filename'] : '') ;?>";
 	G.code_config = <?php echo $editor_config;?>;
 	G.code_theme_all = "<?php echo $config['setting_all']['codethemeall']?>";
 	seajs.config({
diff --git a/template/editor/editor.php b/template/editor/editor.php
index 02e05b7..d29d652 100755
--- a/template/editor/editor.php
+++ b/template/editor/editor.php
@@ -50,7 +50,7 @@
 <script src="<?php echo STATIC_PATH;?>js/lib/seajs/sea.js?ver=<?php echo KOD_VERSION;?>"></script>
 <script src="./index.php?user/common_js#id=<?php echo rand_string(8);?>"></script>
 <script type="text/javascript">
-	G.project = "<?php echo $_GET['project'];?>";
+	G.project = "<?php echo (isset($_GET['project']) ? $_GET['project'] : '') ;?>";
 	seajs.config({
 		base: "<?php echo STATIC_PATH;?>js/",
 		preload: ["lib/jquery-1.8.0.min"],

From 4dc9d0d6dd24e6cc5e15ce1820151e9179431db4 Mon Sep 17 00:00:00 2001
From: zsx <zsx@zsxsoft.com>
Date: Tue, 25 Aug 2015 19:04:16 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E8=8E=B7=E5=8F=96=E5=87=BA=E9=94=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/function/file.function.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/function/file.function.php b/lib/function/file.function.php
index ba3c6fe..f795bf4 100755
--- a/lib/function/file.function.php
+++ b/lib/function/file.function.php
@@ -131,7 +131,7 @@ function get_path_ext($path){
 
 //自动获取不重复文件(夹)名
 //如果传入$file_add 则检测存在则自定重命名  a.txt 为a{$file_add}.txt
-function get_filename_auto($path,$file_add){
+function get_filename_auto($path,$file_add = ""){
 	$i=1;
 	$father = get_path_father($path);
 	$name =  get_path_this($path);

From 1d602643225654c965a6a80ed655e9ba0fa88489 Mon Sep 17 00:00:00 2001
From: zsx <zsx@zsxsoft.com>
Date: Tue, 25 Aug 2015 19:05:07 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9C=A8=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E6=83=85=E5=86=B5=E4=B8=8B=E6=97=A0=E6=B3=95=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E7=BC=93=E5=AD=98=E5=AF=BC=E8=87=B4session=5Fstart?=
 =?UTF-8?q?=E5=87=BA=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.php b/config/config.php
index eb812cc..03d2f78 100755
--- a/config/config.php
+++ b/config/config.php
@@ -97,7 +97,7 @@ if (strtoupper(substr(PHP_OS, 0,3)) === 'WIN') {
 }
 
 $in = parse_incoming();
-session_start();
+@session_start();
 session_write_close();//避免session锁定问题;之后要修改$_SESSION 需要先调用session_start()
 $config['autorun'] = array(
 	array('controller'=>'user','function'=>'loginCheck'),

From f4e0f366f123c01c15de491b10ab085597552280 Mon Sep 17 00:00:00 2001
From: zsx <zsx@zsxsoft.com>
Date: Tue, 25 Aug 2015 19:13:29 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E7=B2=98=E8=B4=B4=E7=99=BD=E5=B1=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/explorer.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controller/explorer.class.php b/controller/explorer.class.php
index 1617069..9e694d2 100755
--- a/controller/explorer.class.php
+++ b/controller/explorer.class.php
@@ -394,7 +394,7 @@ class explorer extends Controller{
     }
     public function pathPast(){
         if (!isset($_SESSION['path_copy'])){
-            show_json($this->L['clipboard_null'],false,$data);
+            show_json($this->L['clipboard_null'],false,array());
         }
 
         session_start();//re start

From 1ac48df95ad25067e9ed0de535bcca9cd06af683 Mon Sep 17 00:00:00 2001
From: zsx <zsx@zsxsoft.com>
Date: Tue, 25 Aug 2015 19:13:37 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E6=97=A0=E6=9D=83=E9=99=90=E6=97=B6=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/function/file.function.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/function/file.function.php b/lib/function/file.function.php
index f795bf4..de17413 100755
--- a/lib/function/file.function.php
+++ b/lib/function/file.function.php
@@ -629,8 +629,8 @@ function file_download_this($from, $file_name){
 		}
 		//下载完成，重命名临时文件到目标文件
 		del_file($file_name);
-		rename($temp_file,$file_name);
-		return true;
+		$rename_ret = @rename($temp_file,$file_name);
+		return (bool)$rename_ret;
 	}else{
 		return false;
 	}	

From 5a28ef3fb5b06557fd2b9c0de206463682fabb06 Mon Sep 17 00:00:00 2001
From: zsx <zsx@zsxsoft.com>
Date: Tue, 25 Aug 2015 20:02:29 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=87=E7=BD=91?=
 =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E6=8A=A5=E9=94=99open=5Fbasedir=20restrictio?=
 =?UTF-8?q?n=20in=20effect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

如果文件夹内有.gitignore的话左边栏必报错
---
 lib/function/file.function.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/function/file.function.php b/lib/function/file.function.php
index de17413..af6f2a0 100755
--- a/lib/function/file.function.php
+++ b/lib/function/file.function.php
@@ -292,7 +292,8 @@ function path_haschildren($dir,$check_file=false){
 			if ($check_file) {//有子目录或者文件都说明有子内容
 				if(is_dir($fullpath.'/') || is_file($fullpath)) return true;
 			}else{//只检查有没有文件
-				if(is_dir($fullpath.'/')) return true;
+				@$ret =(is_dir($fullpath.'/'));
+				return (bool)$ret;
 			}
 		} 
 	}