From be890b9f4cbf31e45ec8c578bc60d9e5c74b7708 Mon Sep 17 00:00:00 2001 From: CoolSpring8 Date: Wed, 1 Apr 2015 11:09:33 +0800 Subject: [PATCH 01/24] Update main.php --- data/i18n/zh_CN/main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/i18n/zh_CN/main.php b/data/i18n/zh_CN/main.php index ac6913b..43bb001 100755 --- a/data/i18n/zh_CN/main.php +++ b/data/i18n/zh_CN/main.php @@ -428,7 +428,7 @@ $L= array( "group_role_group_edit" => "编辑用户组", "group_role_group_del" => "删除用户组", "group_role_ext_warning" => "不允许此类文件的上传,
重命名(重命名为指定扩展名),
编辑保存,远程下载,解压", - "group_tips"=>"
  • 1.用户组名不能重复，修改组名后原属于改组用户会自动关联
  • 2.扩展名限制关系系统安全性，请务必谨慎操作(果在web目录下新建php;就意味着改程序的权限对此用户形同虚设)
  • 3.户管理、权限组管理；查看权限和增删改权限是绑定的；程序会自动关联
  • 4.设定权限组能添加权限组后，后续权限是不继承的（此权限相当于最高权限）
    • ", + "group_tips"=>"
  • 1.用户组名不能重复，修改组名后原属于改组用户会自动关联
  • 2.扩展名限制关系系统安全性，请务必谨慎操作(如果在web目录下新建php;就意味着改程序的权限对此用户形同虚设)
  • 3.用户管理、权限组管理；查看权限和增删改权限是绑定的；程序会自动关联
  • 4.设定权限组能添加权限组后，后续权限是不继承的（此权限相当于最高权限）
    • ", //explorer_ajax "not_null" => "必填项不能为空!", @@ -484,4 +484,4 @@ $L= array( "button_save_edit" => "保存修改", "button_save_submit" => "保存提交", "button_select_all" => "全选/反选" -); \ No newline at end of file +); From 15be08a15a2077d1e5a8be8143a61cd1453754fa Mon Sep 17 00:00:00 2001 From: CoolSpring8 Date: Wed, 1 Apr 2015 11:26:04 +0800 Subject: [PATCH 02/24] Update main.php --- data/i18n/en/main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/i18n/en/main.php b/data/i18n/en/main.php index e4fc913..6537f04 100755 --- a/data/i18n/en/main.php +++ b/data/i18n/en/main.php @@ -422,7 +422,7 @@ Even as webIDE, can be directly online development. You can also integrate the t "group_role_group_edit" => "group edit", "group_role_group_del" => "group remove", "group_role_ext_warning" => "Not allowed to specify the type of file upload,
    rename (renamed the specified extension),
    edit,save, remote download,unzip", - "group_tips"=>"
  • 1.group name can not be repeated, modify group name belongs to the reorganization of the user is automatically associated
  • 2. extension restriction relation system safety, please be careful operation (fruit in the web directory of new PHP; means reform program permissions for this user name)
  • 3. user management, privilege management; access and to the authority is bound; the program will automatically associated
  • 4. set permissions can add permissions set, subsequent permission is not inherited (this permission is equivalent to the highest authority)
    • ", + "group_tips"=>"
  • 1.group name can not be repeated, modify group name belongs to the reorganization of the user is automatically associated
  • 2. extension restriction relation system safety, please be careful operation (If the user create a new .php file in the web directory; means reform program permissions for this user name)
  • 3. user management, privilege management; access and to the authority is bound; the program will automatically associated
  • 4. set permissions can add permissions set, subsequent permission is not inherited (this permission is equivalent to the highest authority)
    • ", //explorer_ajax "not_null" => "required cannot be empty!", @@ -478,4 +478,4 @@ Even as webIDE, can be directly online development. You can also integrate the t "button_save_edit" => "save", "button_save_submit" => "save and send", "button_select_all" => "Select / unselect all" -); \ No newline at end of file +); From 3026a3d812e96e415b7e0b2126fbce72bcb372f3 Mon Sep 17 00:00:00 2001 From: CoolSpring8 Date: Wed, 1 Apr 2015 11:48:04 +0800 Subject: [PATCH 03/24] Update main.php --- data/i18n/zh_TW/main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/i18n/zh_TW/main.php b/data/i18n/zh_TW/main.php index f1487e6..fd4409c 100755 --- a/data/i18n/zh_TW/main.php +++ b/data/i18n/zh_TW/main.php @@ -425,7 +425,7 @@ $L= array( "group_role_group_edit" => "編輯用護組", "group_role_group_del" => "刪除用護組", "group_role_ext_warning" => "不允許此類檔的上傳,
    重命名(重命名為指定擴展名),
    編輯保存,遠程下載,解壓", - "group_tips"=>"
  • 1.用護組名不能重複，修改組名後原屬於改組用護會自動關聯
  • 2.擴展名限制關系系統安全性，請務必謹慎操作(果在web目錄下新建php;就意味著改程式的許可權對此用護形同虛設)
  • 3.護管理、許可權組管理；查看許可權和增刪改許可權是邦定的；程式會自動關聯
  • 4.設定許可權組能添加許可權組後，後續許可權是不繼承的（此許可權相當於最高許可權）
    • ", + "group_tips"=>"
  • 1.用護組名不能重複，修改組名後原屬於改組用護會自動關聯
  • 2.擴展名限制關系系統安全性，請務必謹慎操作(如果在web目錄下新建php;就意味著改程式的許可權對此用護形同虛設)
  • 3.護管理、許可權組管理；查看許可權和增刪改許可權是邦定的；程式會自動關聯
  • 4.設定許可權組能添加許可權組後，後續許可權是不繼承的（此許可權相當於最高許可權）
    • ", //explorer_ajax "not_null" => "必填項不能為空!", @@ -481,4 +481,4 @@ $L= array( "button_save_edit" => "保存修改", "button_save_submit" => "保存提交", "button_select_all" => "全選/反選" -); \ No newline at end of file +); From 421ba856cf78b0854b6f602dff62d124a5055c57 Mon Sep 17 00:00:00 2001 From: CoolSpring8 Date: Wed, 1 Apr 2015 11:59:18 +0800 Subject: [PATCH 04/24] Update main.php --- data/i18n/zh_TW/main.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/i18n/zh_TW/main.php b/data/i18n/zh_TW/main.php index fd4409c..8d37682 100755 --- a/data/i18n/zh_TW/main.php +++ b/data/i18n/zh_TW/main.php @@ -415,17 +415,17 @@ $L= array( "group_role_upload" => "允許上傳", "group_role_download" => "遠程下載", "group_role_passowrd" => "修改密碼", - "group_role_config" => "用護配置", + "group_role_config" => "用戶配置", "group_role_fav" => "收藏夾操作(添加/編輯/刪除)", "group_role_list" => "列表查看", - "group_role_member_add" => "添加用護", - "group_role_member_edit" => "編輯用護", - "group_role_member_del" => "刪除用護", - "group_role_group_add" => "添加用護組", - "group_role_group_edit" => "編輯用護組", - "group_role_group_del" => "刪除用護組", + "group_role_member_add" => "添加用戶", + "group_role_member_edit" => "編輯用戶", + "group_role_member_del" => "刪除用戶", + "group_role_group_add" => "添加用戶組", + "group_role_group_edit" => "編輯用戶組", + "group_role_group_del" => "刪除用戶組", "group_role_ext_warning" => "不允許此類檔的上傳,
    重命名(重命名為指定擴展名),
    編輯保存,遠程下載,解壓", - "group_tips"=>"
  • 1.用護組名不能重複，修改組名後原屬於改組用護會自動關聯
  • 2.擴展名限制關系系統安全性，請務必謹慎操作(如果在web目錄下新建php;就意味著改程式的許可權對此用護形同虛設)
  • 3.護管理、許可權組管理；查看許可權和增刪改許可權是邦定的；程式會自動關聯
  • 4.設定許可權組能添加許可權組後，後續許可權是不繼承的（此許可權相當於最高許可權）
    • ", + "group_tips"=>"
  • 1.用戶組名不能重複，修改組名後原屬於改組用戶會自動關聯
  • 2.擴展名限制關系系統安全性，請務必謹慎操作(如果在web目錄下新建php;就意味著改程式的許可權對此用戶形同虛設)
  • 3.用戶管理、許可權組管理；查看許可權和增刪改許可權是邦定的；程式會自動關聯
  • 4.設定許可權組能添加許可權組後，後續許可權是不繼承的（此許可權相當於最高許可權）
    • ", //explorer_ajax "not_null" => "必填項不能為空!", From 7b4de6ce52c33d9da4c41ce24e6eb7d78a2f510e Mon Sep 17 00:00:00 2001 From: zzg Date: Sat, 6 Jun 2015 01:02:55 +0800 Subject: [PATCH 05/24] Create Dockerfile --- Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..95ae552 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM tutum/apache-php +RUN apt-get update && apt-get install -yq git && rm -rf /var/lib/apt/lists/* +RUN rm -fr /app +ADD . /app +RUN mkdir /data +RUN chmod -R 777 /data +RUN composer install From fec407a9346605ca1636c7d04e15734079eb81e0 Mon Sep 17 00:00:00 2001 From: zzg Date: Sat, 6 Jun 2015 01:12:45 +0800 Subject: [PATCH 06/24] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 95ae552..2e2fd3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM tutum/apache-php -RUN apt-get update && apt-get install -yq git && rm -rf /var/lib/apt/lists/* +RUN rm -rf /var/lib/apt/lists/* RUN rm -fr /app ADD . /app RUN mkdir /data From 0a0aec82204f8046da5130ad7e7207448ec3c928 Mon Sep 17 00:00:00 2001 From: zzg Date: Sat, 6 Jun 2015 01:13:54 +0800 Subject: [PATCH 07/24] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2e2fd3e..0a78167 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,4 +4,3 @@ RUN rm -fr /app ADD . /app RUN mkdir /data RUN chmod -R 777 /data -RUN composer install From ce611ce91b74c6a43a6c71a470e1a6b9a4b986d2 Mon Sep 17 00:00:00 2001 From: zzg Date: Sat, 6 Jun 2015 04:48:17 +0800 Subject: [PATCH 08/24] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 0a78167..4edb4d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,3 +4,4 @@ RUN rm -fr /app ADD . /app RUN mkdir /data RUN chmod -R 777 /data +RUN chmod -R 777 /app From 0f621a96d2a23c52c3419c0d8ff62160a89e5a6e Mon Sep 17 00:00:00 2001 From: zzg Date: Sat, 6 Jun 2015 18:09:12 +0800 Subject: [PATCH 09/24] Update explorer.class.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 尝试修复liunx公共目录无法访问 --- controller/explorer.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controller/explorer.class.php b/controller/explorer.class.php index c7ad34d..f65f143 100755 --- a/controller/explorer.class.php +++ b/controller/explorer.class.php @@ -199,7 +199,7 @@ class explorer extends Controller{ array('name'=>$this->L['root_path'],'children'=>$root,'menuType'=>"menuTreeRoot", 'iconSkin'=>"my",'open'=>true,'this_path'=> MYHOME,'isParent'=>$root_isparent), array('name'=>$this->L['public_path'],'children'=>$public,'menuType'=>"menuTreeRoot", - 'iconSkin'=>"lib",'open'=>true,'this_path'=> '*public*','isParent'=>$public_isparent) + 'iconSkin'=>"lib",'open'=>true,'this_path'=> PUBLIC_PATH,'isParent'=>$public_isparent) ); show_json($tree_data); } @@ -727,4 +727,4 @@ class explorer extends Controller{ _DIR_OUT($list); return $list; } -} \ No newline at end of file +} From 366b18f298129c1a041054627173f114b3b63ef3 Mon Sep 17 00:00:00 2001 From: Hex Date: Mon, 22 Jun 2015 02:24:30 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=90=8D=E9=99=90=E5=88=B6=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E6=97=B6=E6=97=A0=E6=B3=95=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/util.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controller/util.php b/controller/util.php index 3d79ace..f92b1e6 100755 --- a/controller/util.php +++ b/controller/util.php @@ -103,7 +103,8 @@ function checkExt($file,$changExt=false){ $not_allow = $GLOBALS['auth']['ext_not_allow']; $ext_arr = explode('|',$not_allow); foreach ($ext_arr as $current) { - if (stristr($file,'.'.$current)){//含有扩展名 + $current = trim($current); + if ($current !== '' && stristr($file,'.'.$current)){//含有扩展名 return 0; } } From 6643b58a25a29ba37349e84ce78a8bc08c6dc8f8 Mon Sep 17 00:00:00 2001 From: Hex Date: Tue, 23 Jun 2015 10:54:16 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=87=A0=E4=B8=AA?= =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/i18n/zh_CN/main.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/i18n/zh_CN/main.php b/data/i18n/zh_CN/main.php index 43bb001..de9f482 100755 --- a/data/i18n/zh_CN/main.php +++ b/data/i18n/zh_CN/main.php @@ -97,7 +97,7 @@ $L= array( "new_user_app_desc" =>"应用中心的应用，多个用逗号隔开", "auto_login" =>"游客自动登录", "auto_login_desc" =>"默认登录用户名为guest的用户；开启后确保guest用户存在", - "first_in" =>"登陆后默认进入", + "first_in" =>"登录后默认进入", "menu_name" =>"菜单名", "menu_hidden" => "隐藏", "menu_show" =>"显示", @@ -120,7 +120,7 @@ $L= array( "php_env_error_file" =>"未开启 file_get_contents", "php_env_error_path" =>"不可写", "php_env_error_gd" =>"须开启php GD库, 否则验证码、缩略图使用将不正常", - "install_login" =>"您可以用如下账号登陆", + "install_login" =>"您可以用如下账号登录", "install_enter" =>"进入系统", "install_user_default" =>"管理员：admin/admin(请务必修改密码)
    普通用户：demo/demo
    游客用户：guest/guest", @@ -135,7 +135,7 @@ $L= array( "kod_name_copyright" => "芒果云•资源管理器", //login - "login" => "登陆 ", + "login" => "登录 ", "guest_login" => "游客登录", "username" => "用户名", "password" => "密码", @@ -148,7 +148,7 @@ $L= array( "password_error" => "密码错误!", "password_not_null" => "密码不能为空!", "old_password_error" => "原密码错误!", - "permission" => "权限!", + "permission" => "权限", "permission_edit" => "修改权限", "no_permission" => "管理员禁止了此权限!", "no_permission_ext" => "管理员禁止了该类型文件权限", @@ -346,7 +346,7 @@ $L= array( "ui_editor" => "编辑器", "adminer" => "adminer", "ui_project_home" => "项目主页", - "ui_login" => "登陆", + "ui_login" => "登录", "ui_logout" => "退出", @@ -392,7 +392,7 @@ $L= array( "if_save_file" => "文件尚未保存,是否保存？", "if_remove" => "确认删除", "member_remove_tips" => "删除后该用户目录会被清空", - "group_remove_tips" => "删除后该用户组用户无法登陆
    (需要重新设置用户组)", + "group_remove_tips" => "删除后该用户组用户无法登录
    (需要重新设置用户组)", "group_name" => "用户组名", "group_name_tips" => "建议英文名，不能重复", "group_desc" => "展示名称", From 9f6cc0e6c7fa9babfab3775ff097a6b5347d883f Mon Sep 17 00:00:00 2001 From: Hex Date: Tue, 23 Jun 2015 10:56:55 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=87=A0=E4=B8=AA?= =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/i18n/zh_CN/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/i18n/zh_CN/main.php b/data/i18n/zh_CN/main.php index de9f482..cc7c443 100755 --- a/data/i18n/zh_CN/main.php +++ b/data/i18n/zh_CN/main.php @@ -135,7 +135,7 @@ $L= array( "kod_name_copyright" => "芒果云•资源管理器", //login - "login" => "登录 ", + "login" => "登录", "guest_login" => "游客登录", "username" => "用户名", "password" => "密码", From 5a571073aa5dc936f5131d71e65419e9988a8681 Mon Sep 17 00:00:00 2001 From: zhangweihu Date: Tue, 11 Aug 2015 09:42:32 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9C=A8HTTPS?= =?UTF-8?q?=E4=B8=8B=E6=89=93=E5=BC=80=E6=96=87=E4=BB=B6=E5=87=BA=E9=94=99?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=E5=8E=9F=E5=9B=A0=E6=98=AFconfig?= =?UTF-8?q?.php=E6=96=87=E4=BB=B6=E4=B8=ADHOST=E5=B8=B8=E9=87=8F=E8=A2=AB?= =?UTF-8?q?=E7=A1=AC=E7=BC=96=E7=A0=81=E4=B8=BAhttp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/config/config.php b/config/config.php index 7d3c285..eb812cc 100755 --- a/config/config.php +++ b/config/config.php @@ -18,8 +18,19 @@ $web_root = str_replace(P($_SERVER['SCRIPT_NAME']),'',P(dirname(dirname(__FILE__ if (substr($web_root,-10) == 'index.php/') {//解决部分主机不兼容问题 $web_root = P($_SERVER['DOCUMENT_ROOT']).'/'; } +function is_HTTPS(){ + if(!isset($_SERVER['HTTPS'])) return FALSE; + if($_SERVER['HTTPS'] === 1){ //Apache + return TRUE; + }elseif($_SERVER['HTTPS'] === 'on'){ //IIS + return TRUE; + }elseif($_SERVER['SERVER_PORT'] == 443){ //其他 + return TRUE; + } + return FALSE; +} define('WEB_ROOT',$web_root); -define('HOST','http://'.$_SERVER['HTTP_HOST'].'/'); +define('HOST', (is_HTTPS() ? 'https://' :'http://').$_SERVER['HTTP_HOST'].'/'); define('BASIC_PATH', P(dirname(dirname(__FILE__))).'/'); define('APPHOST', HOST.str_replace(WEB_ROOT,'',BASIC_PATH));//程序根目录 define('TEMPLATE', BASIC_PATH .'template/'); //模版文件路径 From 2b2ea121cee7b0f1cd3c44bae979dc7951d4b577 Mon Sep 17 00:00:00 2001 From: zsx Date: Tue, 25 Aug 2015 18:17:59 +0800 Subject: [PATCH 14/24] =?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 Date: Tue, 25 Aug 2015 18:18:28 +0800 Subject: [PATCH 15/24] =?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 Date: Tue, 25 Aug 2015 18:30:55 +0800 Subject: [PATCH 16/24] =?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 Date: Tue, 25 Aug 2015 18:45:22 +0800 Subject: [PATCH 17/24] =?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">