From 4668093006f103d6a09618e7611d793316f16c01 Mon Sep 17 00:00:00 2001 From: kalcaddle <824691958@qq.com> Date: Tue, 2 Sep 2014 22:49:20 +0800 Subject: [PATCH] ver 2.71 --- README.md | 51 +- config/config.php | 10 +- config/version.php | 2 +- controller/app.class.php | 17 - controller/desktop.class.php | 4 +- controller/editor.class.php | 42 +- controller/explorer.class.php | 4 +- controller/index.html | 0 controller/user.class.php | 19 +- controller/util.php | 13 +- data/User/admin/data/config.php | 2 +- data/User/admin/data/editor_config.php | 1 + data/User/demo/home/desktop/365日历.oexe | 1 + data/User/demo/home/desktop/iqiyi影视.oexe | 1 + data/User/demo/home/desktop/js在线压缩.oexe | 1 + data/User/demo/home/desktop/linux终端.oexe | 1 + data/User/demo/home/desktop/pptv直播.oexe | 1 + data/User/demo/home/desktop/ps.oexe | 1 + data/User/demo/home/desktop/qq音乐.oexe | 1 + data/User/demo/home/desktop/三维地图.oexe | 1 + data/User/demo/home/desktop/中国象棋.oexe | 1 + data/User/demo/home/desktop/创业邦.oexe | 1 + data/User/demo/home/desktop/在线视频.oexe | 1 + data/User/demo/home/desktop/好照片.oexe | 1 + data/User/demo/home/desktop/快递查询.oexe | 1 + data/User/demo/home/desktop/搜狐影视.oexe | 1 + data/User/demo/home/desktop/时钟.oexe | 1 + data/User/demo/home/desktop/有道词典.oexe | 1 + data/User/demo/home/desktop/格林童话.oexe | 1 + data/User/demo/home/desktop/植物大战僵尸.oexe | 1 + data/User/demo/home/desktop/水果忍者.oexe | 1 + data/User/demo/home/desktop/美图秀秀.oexe | 1 + data/User/demo/home/desktop/美食天下.oexe | 1 + data/User/demo/home/desktop/虾米电台.oexe | 1 + data/User/demo/home/desktop/计算器.oexe | 1 + data/User/demo/home/desktop/豆瓣电台.oexe | 1 + data/User/demo/home/desktop/酷狗电台.oexe | 1 + data/User/demo/home/desktop/音悦台.oexe | 1 + data/User/index.html | 0 data/index.html | 0 data/system/group.php | 2 +- lib/class/fileCache.class.php | 1 + lib/function/file.function.php | 2 +- lib/index.html | 0 lib/plugins/index.html | 0 static/index.html | 0 static/js/_dev/common/core.js | 10 +- static/js/_dev/common/pathOpen.js | 13 + static/js/_dev/common/taskTap.js | 3 +- static/js/_dev/src/app/page.js | 6 +- static/js/_dev/src/desktop/ui.js | 2 +- static/js/_dev/src/edit/edit.js | 62 +- static/js/_dev/src/explorer/fileSelect.js | 1 + static/js/_dev/src/explorer/path.js | 2 +- static/js/_dev/src/explorer/ui.js | 3 +- static/js/_dev/src/setting/member.js | 2 +- static/js/_dev/update/main.js | 30 +- static/js/app/src/app/main.js | 2 +- static/js/app/src/desktop/main.js | 6 +- static/js/app/src/edit/main.js | 2 +- static/js/app/src/editor/main.js | 4 +- static/js/app/src/explorer/main.js | 8 +- static/js/app/src/setting/main.js | 2 +- static/js/app/update/main.js | 2 +- static/js/lib/artDialog/jquery-artDialog.js | 2 +- .../js/lib/contextMenu/jquery-contextMenu.js | 1 + static/js/lib/picasa/style/style.css | 2 +- static/js/lib/seajs/sea.js | 1 - static/js/lib/webuploader/Uploader.swf | Bin 34842 -> 143169 bytes static/js/lib/webuploader/webuploader-min.js | 3 +- static/js/lib/webuploader/webuploader.css | 45 +- static/js/lib/webuploader/webuploader.js | 8020 +++++++++++------ static/style/skin/common.less | 26 +- static/style/skin/default/app_code_edit.css | 27 +- static/style/skin/default/app_desktop.css | 31 +- static/style/skin/default/app_desktop.less | 2 +- static/style/skin/default/app_editor.css | 27 +- static/style/skin/default/app_explorer.css | 36 +- static/style/skin/default/app_explorer.less | 7 +- static/style/skin/default/app_setting.css | 27 +- static/style/skin/default/dialog.less | 8 +- static/style/skin/default/filelist.less | 2 +- static/style/skin/metro/app_code_edit.css | 27 +- static/style/skin/metro/app_desktop.css | 31 +- static/style/skin/metro/app_desktop.less | 2 +- static/style/skin/metro/app_editor.css | 27 +- static/style/skin/metro/app_explorer.css | 40 +- static/style/skin/metro/app_explorer.less | 11 +- static/style/skin/metro/app_setting.css | 27 +- .../style/skin/metro/blue_app_code_edit.css | 27 +- static/style/skin/metro/blue_app_desktop.css | 31 +- static/style/skin/metro/blue_app_editor.css | 27 +- static/style/skin/metro/blue_app_explorer.css | 40 +- static/style/skin/metro/blue_app_setting.css | 27 +- static/style/skin/metro/dialog.less | 5 +- static/style/skin/metro/filelist.less | 2 +- .../style/skin/metro/green_app_code_edit.css | 27 +- static/style/skin/metro/green_app_desktop.css | 31 +- static/style/skin/metro/green_app_editor.css | 27 +- .../style/skin/metro/green_app_explorer.css | 40 +- static/style/skin/metro/green_app_setting.css | 27 +- .../style/skin/metro/grey_app_code_edit.css | 27 +- static/style/skin/metro/grey_app_desktop.css | 31 +- static/style/skin/metro/grey_app_editor.css | 27 +- static/style/skin/metro/grey_app_explorer.css | 40 +- static/style/skin/metro/grey_app_setting.css | 27 +- .../style/skin/metro/leaf_app_code_edit.css | 27 +- static/style/skin/metro/leaf_app_desktop.css | 31 +- static/style/skin/metro/leaf_app_editor.css | 27 +- static/style/skin/metro/leaf_app_explorer.css | 40 +- static/style/skin/metro/leaf_app_setting.css | 27 +- .../style/skin/metro/orange_app_code_edit.css | 27 +- .../style/skin/metro/orange_app_desktop.css | 31 +- static/style/skin/metro/orange_app_editor.css | 27 +- .../style/skin/metro/orange_app_explorer.css | 40 +- .../style/skin/metro/orange_app_setting.css | 27 +- .../style/skin/metro/pink_app_code_edit.css | 27 +- static/style/skin/metro/pink_app_desktop.css | 31 +- static/style/skin/metro/pink_app_editor.css | 27 +- static/style/skin/metro/pink_app_explorer.css | 40 +- static/style/skin/metro/pink_app_setting.css | 27 +- .../style/skin/metro/purple_app_code_edit.css | 27 +- .../style/skin/metro/purple_app_desktop.css | 31 +- static/style/skin/metro/purple_app_editor.css | 27 +- .../style/skin/metro/purple_app_explorer.css | 40 +- .../style/skin/metro/purple_app_setting.css | 27 +- static/style/skin/simple/app_code_edit.css | 27 +- static/style/skin/simple/app_desktop.css | 31 +- static/style/skin/simple/app_desktop.less | 2 +- static/style/skin/simple/app_editor.css | 27 +- static/style/skin/simple/app_explorer.css | 36 +- static/style/skin/simple/app_explorer.less | 7 +- static/style/skin/simple/app_setting.css | 27 +- static/style/skin/simple/dialog.less | 6 +- static/style/skin/simple/filelist.less | 2 +- template/app/index.php | 10 +- template/common/navbar.html | 2 +- template/desktop/index.php | 19 +- template/editor/edit.php | 24 +- template/editor/editor.php | 12 +- template/explorer/index.php | 16 +- template/index.html | 0 template/setting/index.php | 11 +- template/user/install.html | 9 +- template/user/login.html | 9 +- 145 files changed, 6291 insertions(+), 3845 deletions(-) create mode 100644 controller/index.html create mode 100644 data/User/admin/data/editor_config.php create mode 100644 data/User/demo/home/desktop/365日历.oexe create mode 100644 data/User/demo/home/desktop/iqiyi影视.oexe create mode 100644 data/User/demo/home/desktop/js在线压缩.oexe create mode 100644 data/User/demo/home/desktop/linux终端.oexe create mode 100644 data/User/demo/home/desktop/pptv直播.oexe create mode 100644 data/User/demo/home/desktop/ps.oexe create mode 100644 data/User/demo/home/desktop/qq音乐.oexe create mode 100644 data/User/demo/home/desktop/三维地图.oexe create mode 100644 data/User/demo/home/desktop/中国象棋.oexe create mode 100644 data/User/demo/home/desktop/创业邦.oexe create mode 100644 data/User/demo/home/desktop/在线视频.oexe create mode 100644 data/User/demo/home/desktop/好照片.oexe create mode 100644 data/User/demo/home/desktop/快递查询.oexe create mode 100644 data/User/demo/home/desktop/搜狐影视.oexe create mode 100644 data/User/demo/home/desktop/时钟.oexe create mode 100644 data/User/demo/home/desktop/有道词典.oexe create mode 100644 data/User/demo/home/desktop/格林童话.oexe create mode 100644 data/User/demo/home/desktop/植物大战僵尸.oexe create mode 100644 data/User/demo/home/desktop/水果忍者.oexe create mode 100644 data/User/demo/home/desktop/美图秀秀.oexe create mode 100644 data/User/demo/home/desktop/美食天下.oexe create mode 100644 data/User/demo/home/desktop/虾米电台.oexe create mode 100644 data/User/demo/home/desktop/计算器.oexe create mode 100644 data/User/demo/home/desktop/豆瓣电台.oexe create mode 100644 data/User/demo/home/desktop/酷狗电台.oexe create mode 100644 data/User/demo/home/desktop/音悦台.oexe create mode 100644 data/User/index.html create mode 100644 data/index.html create mode 100644 lib/index.html create mode 100644 lib/plugins/index.html create mode 100644 static/index.html create mode 100644 template/index.html diff --git a/README.md b/README.md index 55ba7b2..828f30f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ ##KodExplorer (http://kalcaddle.com/) -###ver2.61(2014.7.12) +###ver2.71(2014.8.31) `商业版授权请联系:kalcaddle#qq.com` #### 1.是什么: - Kodexplorer为千帆网络工作室开发的一款服务器文件管理程序。 - - 完美取代FTP管理:可用于服务器文件管理,zip解压缩 备份还原、支持图片、音乐、视频预览、office、pdf等格式在线预览。文件夹拖拽上传……。 + - 完美取代FTP管理:可用于服务器文件管理,zip解压缩、备份还原、支持图片、音乐、视频预览、office、pdf等格式在线预览。文件夹拖拽上传……。 - 在线编程:支持几乎所有编程语言的在线编辑(高亮,多光标编辑.堪比本地的sublime) - 极佳的操作体验:及其便捷的快捷键支持,让你拥有本地化的体验 - 中文等多语言支持:中文编码全面兼容,文件编辑自动适配。 @@ -17,7 +17,7 @@ - 你可以把他当做管理linux的一个操作系统界面 - 可以用来作为私有云存储系统,存储你的文件... - 当然你也可以用来分享文件 - - Web IDE / browser code editor awesomeness + - Web IDE - 更多场景等你来挖掘!…… #### 3.使用说明 @@ -25,17 +25,56 @@ 普通用户:demo/demo 游客用户:guest/guest [如何使用] 下载程序,解压上传到你的服务器路径下,data目录设置777权限。访问体验超便捷的服务吧! - (data目录没有写权限会导致配置修改不能保存、不能新建用户等) + (为确保数据安全,最好配置服务器不允许列目录) [关于上传问题] 程序没有做任何限制,如果需要上传大文件,则修改 - php.ini:`upload_max_filesize = 1000M post_max_size = 1000M` + php.ini:`upload_max_filesize = 1000M post_max_size = 1000M` [详情:http://955.cc/R2yT] [关于解压缩问题] 程序不做任何限制,如若失败请设置php内存限制。memory_limit 1000M + [关于"系统错误"] 请配置php错误提示级别error_reporting; 配置php.ini或者允许error_reporting函数 [关于兼容性] 建议使用chrome firefox ie9+ 体验更完整。ie8以下基本上不做兼容处理。chrome支持文件夹拖拽上传。 - [文件打开] office文件在线预览功能,服务器必须在公网(外部能访问该服务器) + [文件打开] office文件在线预览功能,服务器必须在公网(外部能访问该服务器); + 内部或局域网需要使用请参考qq群共享“web office搭建”,然后配置kod程序config/config.php OFFICE_SERVER + [安全提示] 为确保数据安全,请设置http服务器不允许列目录。[详情:http://955.cc/R2vw] [忘记密码] 修改data/system/member.php 密码为明文的md5值 例如将admin密码重设为admin 则修改第一行:"name":"admin","password":"21232f297a57a5a743894a0e4a801fc3" ![](https://cloud.githubusercontent.com/assets/3761968/2583304/764f562a-b9cf-11e3-8e59-afdbdffc20eb.png) + + +###ver2.71 `2014/8/31` +---- +####update: + - 编辑器配置保存:文字大小、主题风格;主题修改 + - 精简初始桌面应用 + +####fix bug:(bug解决和程序优化) + - 修改用户密码失败: + - 打开设置设置壁纸,关掉,再打开个人中心,桌面乱掉 + - 桌面开始菜单 最大化问题 + - 语言选择下拉菜单错位 + - 修改主题重叠问题 + - appstore 添加应用tips不见 +ie兼容性 font-face 火狐 + + +###ver2.7 `2014/8/25` +---- +####update: + - 安全及性能优化 + - 静态文件加入?版本标识,版本更新后不缓存 + - webuploader 升级到0.14 优化部分上传问题 + - 错误级别:error_reporting(E_ERROR | E_WARNING); + - 地址栏(tab模式、编辑模式)两种模式宽度自适应 + - 自建office解析服务器配置 + - 最大化全屏 + +####fix bug:(bug解决和程序优化) + - install 加入iconv、mbstring检测 + - 右键重命名 快捷键冒泡处理 + - 文件列表图片缩略图拖拽问题 + - 标题超出部分截取优化 + - 编辑器预览滚动条自适应 + ###ver2.61 `2014/7/12` diff --git a/config/config.php b/config/config.php index 4c6e1dc..e51b205 100644 --- a/config/config.php +++ b/config/config.php @@ -9,7 +9,7 @@ date_default_timezone_set('PRC'); @ini_set('session.cache_expire',600); @set_time_limit(600);//30min pathInfoMuti,search,upload,download... -@ini_set('display_errors',0); +@error_reporting(E_ERROR|E_WARING|E_PARSE); function P($path){return str_replace('\\','/',$path);} define('WEB_ROOT',str_replace(P($_SERVER['SCRIPT_NAME']),'',P(dirname(dirname(__FILE__))).'/index.php').'/'); @@ -30,8 +30,12 @@ define('USER_SYSTEM', DATA_PATH .'system/'); //用户数据存储目录 define('LANGUAGE_PATH', DATA_PATH .'i18n/'); //多语言目录 define('PUBLIC_PATH', DATA_PATH .'public/'); //公共共享目录 读写权限跟随用户目录的读写权限 -define('STATIC_JS','_dev');//_dev app js编译||开发状态 -define('STATIC_LESS','less'); +define('OFFICE_SERVER', ""); +//默认为空则调用微软解析api,需要外网才可以; +//如果内网或局域网使用,引号内填写配置好的地址前缀 形如:"http://***/view.aspx?src=" + +define('STATIC_JS','app');//_dev app js编译||开发状态 +define('STATIC_LESS','css'); define('STATIC_PATH',"./static/");//静态文件目录 //define('STATIC_PATH','http://static.kalcaddle.com/static/'); diff --git a/config/version.php b/config/version.php index 718bf68..9bdb3fa 100644 --- a/config/version.php +++ b/config/version.php @@ -1,2 +1,2 @@ in['data'])); } - - /** - * 用户app初始化 - */ - public function init_app($user) { - $sql=new fileCache($this->config['system_file']['apps']); - $list = $sql->get(); - $desktop = USER_PATH.$user.'/home/desktop/'; - foreach ($list as $key => $data) { - //touch($path); - $path = iconv_system($desktop.$key.'.oexe'); - unset($data['name']); - unset($data['desc']); - unset($data['group']); - file_put_contents($path, json_encode($data)); - } - } } diff --git a/controller/desktop.class.php b/controller/desktop.class.php index 16d335e..fd8901e 100644 --- a/controller/desktop.class.php +++ b/controller/desktop.class.php @@ -18,9 +18,9 @@ class desktop extends Controller{ $this->assign('wall',$wall); }else{ $this->assign('wall',STATIC_PATH.'images/wall_page/'.$wall.'.jpg'); - } + } - if (!is_dir(MYHOME.'desktop/')) { + if (!is_dir(MYHOME.'desktop/') && is_writable(MYHOME)) { mkdir(MYHOME.'desktop/'); } diff --git a/controller/editor.class.php b/controller/editor.class.php index 515f4a4..aed7665 100644 --- a/controller/editor.class.php +++ b/controller/editor.class.php @@ -17,7 +17,8 @@ class editor extends Controller{ $this->display('editor.php'); } // 单文件编辑 - public function edit(){ + public function edit(){ + $this->assign('editor_config',$this->getConfig());//获取编辑器配置信息 $this->display('edit.php'); } @@ -55,7 +56,44 @@ class editor extends Controller{ fclose($fp); show_json($this->L['save_success']); } - //----------------------------------------------- + + /* + * 获取编辑器配置信息 + */ + public function getConfig(){ + $default = array( + 'font_size' => '14px', + 'theme' => 'github', + 'auto_wrap' => 0, + 'display_char' => 0, + 'auto_complete' => 1 + ); + $config_file = USER.'data/editor_config.php'; + if (!file_exists($config_file)) {//不存在则创建 + $sql=new fileCache($config_file); + $sql->reset($default); + }else{ + $sql=new fileCache($config_file); + $default = $sql->get(); + } + return json_encode($default); + } + /* + * 获取编辑器配置信息 + */ + public function setConfig(){ + $key = $this->in['k'];$value = $this->in['v']; + if ($key !='' && $value != '') { + $config_file = USER.'data/editor_config.php'; + $sql=new fileCache($config_file); + $default = $sql->update($key,$value); + show_json($this->L["setting_success"]); + }else{ + show_json($this->L['error'],false); + } + } + + //----------------------------------------------- /* * 获取字符串编码 * @param:$ext 传入字符串 diff --git a/controller/explorer.class.php b/controller/explorer.class.php index 0f009a5..5da0499 100644 --- a/controller/explorer.class.php +++ b/controller/explorer.class.php @@ -527,7 +527,9 @@ class explorer extends Controller{ if (!$header) show_json($this->L['download_error_exists'],false); $save_path = $save_path.urldecode($header['name']); - if (checkExt($save_path)!= true) $save_path = checkExt($save_path,true); + if (!checkExt($save_path)) $save_path = $save_path.'tmp'; + write_log($save_path); + $save_path = iconv_system($save_path); $save_path = get_filename_auto($save_path); diff --git a/controller/index.html b/controller/index.html new file mode 100644 index 0000000..e69de29 diff --git a/controller/user.class.php b/controller/user.class.php index 0f2add1..cbad182 100644 --- a/controller/user.class.php +++ b/controller/user.class.php @@ -104,8 +104,9 @@ class user extends Controller //错误三次输入验证码 session_start();//re start $name = $this->in['name']; - if(intval($_SESSION['code_error_time']) >=3 && - $_SESSION['check_code'] !== strtolower($this->in['check_code'])){ + if(isset($_SESSION['code_error_time']) && + intval($_SESSION['code_error_time']) >=3 && + $_SESSION['check_code'] !== strtolower($this->in['check_code'])){ $this->login($this->L['code_error']); } $member = new fileCache($this->config['system_file']['member']); @@ -156,7 +157,7 @@ class user extends Controller * 权限验证;统一入口检验 */ public function authCheck(){ - if ($GLOBALS['is_root'] == 1) return; + if (isset($GLOBALS['is_root']) && $GLOBALS['is_root'] == 1) return; if (in_array(ACT,$this->notCheck)) return; if (!array_key_exists(ST,$this->config['role_setting']) ) return; if (!in_array(ACT,$this->config['role_setting'][ST])) return; @@ -218,11 +219,19 @@ class user extends Controller /** * 用户app初始化 */ - private function init_app($user) { + public function init_app($user) { $sql=new fileCache($this->config['system_file']['apps']); $list = $sql->get(); + + $default = array('365日历','pptv直播','ps','qq音乐','搜狐影视', + '时钟','水果忍者','计算器','豆瓣电台','音悦台'); + $info = array(); + foreach ($default as $key) { + $info[$key] = $list[$key]; + } $desktop = USER_PATH.$user['name'].'/home/desktop/'; - foreach ($list as $key => $data) { + foreach ($info as $key => $data) { + //touch($path); $path = iconv_system($desktop.$key.'.oexe'); unset($data['name']); unset($data['desc']); diff --git a/controller/util.php b/controller/util.php index 169e8d4..8af1770 100644 --- a/controller/util.php +++ b/controller/util.php @@ -61,12 +61,8 @@ function checkExt($file,$changExt=false){ $file = rawurldecode($file); $ext_arr = explode('|',$not_allow); foreach ($ext_arr as $current) { - if (stripos($file,'.'.$current) !== false){//含有扩展名 - if ($changExt === false) { - return false; - }else{ - return str_replace($ext, 'tmp', $file); - } + if (stristr($file,'.'.$current)){//含有扩展名 + return false; } } return 1; @@ -76,8 +72,9 @@ function checkExt($file,$changExt=false){ //语言包加载:优先级:cookie获取>自动识别 //首次没有cookie则自动识别——存入cookie,过期时间无限 function init_lang(){ - $lang = $_COOKIE['kod_user_language']; - if (strlen($lang)<=0) {//没有cookie + if (isset($_COOKIE['kod_user_language'])) { + $lang = $_COOKIE['kod_user_language']; + }else{//没有cookie preg_match('/^([a-z\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches); $lang = $matches[1]; switch (substr($lang,0,2)) { diff --git a/data/User/admin/data/config.php b/data/User/admin/data/config.php index ead53f1..8a5db5d 100644 --- a/data/User/admin/data/config.php +++ b/data/User/admin/data/config.php @@ -1 +1 @@ -{"list_type":"icon","list_sort_field":"name","list_sort_order":"up","theme":"metro\/","codetheme":"crimson_editor","wall":"2","musictheme":"qqmusic","movietheme":"webplayer"} \ No newline at end of file +{"list_type":"icon","list_sort_field":"name","list_sort_order":"up","theme":"metro\/","codetheme":"crimson_editor","wall":"3","musictheme":"mp3player","movietheme":"webplayer"} \ No newline at end of file diff --git a/data/User/admin/data/editor_config.php b/data/User/admin/data/editor_config.php new file mode 100644 index 0000000..a605faa --- /dev/null +++ b/data/User/admin/data/editor_config.php @@ -0,0 +1 @@ +{"font_size":"18px","theme":"eclipse","auto_wrap":"0","display_char":"0","auto_complete":"0"} \ No newline at end of file diff --git a/data/User/demo/home/desktop/365日历.oexe b/data/User/demo/home/desktop/365日历.oexe new file mode 100644 index 0000000..98e0658 --- /dev/null +++ b/data/User/demo/home/desktop/365日历.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/baidu365.duapp.com\/wnl.html?bd_user=855814346&bd_sig=a64e6e262e8cfa1c42dd716617be2102&canvas_pos=platform","icon":"365.png","width":"544","height":"440","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/iqiyi影视.oexe b/data/User/demo/home/desktop/iqiyi影视.oexe new file mode 100644 index 0000000..a67d8ff --- /dev/null +++ b/data/User/demo/home/desktop/iqiyi影视.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/www.qiyi.com\/mini\/baidu.html?from115","icon":"iqiyi.png","width":"1000","height":"643","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/js在线压缩.oexe b/data/User/demo/home/desktop/js在线压缩.oexe new file mode 100644 index 0000000..a24ca68 --- /dev/null +++ b/data/User/demo/home/desktop/js在线压缩.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/compress.cdn.duapp.com\/","icon":"js.png","width":"510","height":"380","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/linux终端.oexe b/data/User/demo/home/desktop/linux终端.oexe new file mode 100644 index 0000000..b5073e4 --- /dev/null +++ b/data/User/demo/home/desktop/linux终端.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/bellard.org\/jslinux\/","icon":"linux.png","width":"803","height":"546","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/pptv直播.oexe b/data/User/demo/home/desktop/pptv直播.oexe new file mode 100644 index 0000000..dca4c8c --- /dev/null +++ b/data/User/demo/home/desktop/pptv直播.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/app.aplus.pptv.com\/tgapp\/baidu\/live\/main","icon":"pptv.jpg","width":"798","height":"534","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/ps.oexe b/data/User/demo/home/desktop/ps.oexe new file mode 100644 index 0000000..47e8d05 --- /dev/null +++ b/data/User/demo/home/desktop/ps.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/www.webps.cn\/editor\/Editor.swf","icon":"ps.png","width":"800","height":"560","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/qq音乐.oexe b/data/User/demo/home/desktop/qq音乐.oexe new file mode 100644 index 0000000..7d54af8 --- /dev/null +++ b/data/User/demo/home/desktop/qq音乐.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/y.qq.com\/player","icon":"qqmusic.png","width":"800","height":"520","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/三维地图.oexe b/data/User/demo/home/desktop/三维地图.oexe new file mode 100644 index 0000000..ce8f89a --- /dev/null +++ b/data/User/demo/home/desktop/三维地图.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/sz.chachaba.com\/api20110914.html","icon":"map.png","width":"800","height":"600","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/中国象棋.oexe b/data/User/demo/home/desktop/中国象棋.oexe new file mode 100644 index 0000000..57b9c42 --- /dev/null +++ b/data/User/demo/home/desktop/中国象棋.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/apps2.bdimg.com\/store\/static\/kvt\/bbf372221c50a9aaa35a35ea6ee7c922.swf","icon":"xiangqi.jpg","width":"650","height":"502","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/创业邦.oexe b/data/User/demo/home/desktop/创业邦.oexe new file mode 100644 index 0000000..62ce577 --- /dev/null +++ b/data/User/demo/home/desktop/创业邦.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/baidu.html.zcom.com\/chuangyebang\/","icon":"chuangyebang.jpg","width":"545","height":"440","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/在线视频.oexe b/data/User/demo/home/desktop/在线视频.oexe new file mode 100644 index 0000000..6f26633 --- /dev/null +++ b/data/User/demo/home/desktop/在线视频.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/tv.e1951.com\/tv\/index.htm","icon":"app_s2.png","width":"800","height":"600","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/好照片.oexe b/data/User/demo/home/desktop/好照片.oexe new file mode 100644 index 0000000..40ef2eb --- /dev/null +++ b/data/User/demo/home/desktop/好照片.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/www.haozhaopian.com\/flash\/","icon":"haozhaopian.jpg","width":"775","height":"650","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/快递查询.oexe b/data/User/demo/home/desktop/快递查询.oexe new file mode 100644 index 0000000..93e2000 --- /dev/null +++ b/data/User/demo/home/desktop/快递查询.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/baidu.kuaidi100.com\/index2.html","icon":"kuaidi.gif","width":"538","height":"418","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/搜狐影视.oexe b/data/User/demo/home/desktop/搜狐影视.oexe new file mode 100644 index 0000000..723e929 --- /dev/null +++ b/data/User/demo/home/desktop/搜狐影视.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/tv.sohu.com\/upload\/sohuapp\/index.html?api_key=9ca7e3cdef8af010b947f4934a427a2c","icon":"souhu.jpg","width":"798","height":"583","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/时钟.oexe b/data/User/demo/home/desktop/时钟.oexe new file mode 100644 index 0000000..27eb090 --- /dev/null +++ b/data/User/demo/home/desktop/时钟.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/hoorayos.com\/demo\/extapp\/clock\/index.php","icon":"time.png","width":"140","height":"140","simple":1,"resize":0} \ No newline at end of file diff --git a/data/User/demo/home/desktop/有道词典.oexe b/data/User/demo/home/desktop/有道词典.oexe new file mode 100644 index 0000000..2209ef7 --- /dev/null +++ b/data/User/demo/home/desktop/有道词典.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/dict.youdao.com\/app\/baidu","icon":"youdao.jpg","width":"548","height":"490","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/格林童话.oexe b/data/User/demo/home/desktop/格林童话.oexe new file mode 100644 index 0000000..111fcd2 --- /dev/null +++ b/data/User/demo/home/desktop/格林童话.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/www.youban.com\/bdapp\/mp3\/geling.html","icon":"geling.jpg","width":"728","height":"520","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/植物大战僵尸.oexe b/data/User/demo/home/desktop/植物大战僵尸.oexe new file mode 100644 index 0000000..b69b725 --- /dev/null +++ b/data/User/demo/home/desktop/植物大战僵尸.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/apps.bdimg.com\/tools\/popcap\/plantsvszombies\/game.html","icon":"zhiwu.jpg","width":"538","height":"404","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/水果忍者.oexe b/data/User/demo/home/desktop/水果忍者.oexe new file mode 100644 index 0000000..5dc1b46 --- /dev/null +++ b/data/User/demo/home/desktop/水果忍者.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/ucren.com\/demos\/fruit-ninja\/","icon":"fruite.jpg","width":"640","height":"565","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/美图秀秀.oexe b/data/User/demo/home/desktop/美图秀秀.oexe new file mode 100644 index 0000000..535ca00 --- /dev/null +++ b/data/User/demo/home/desktop/美图秀秀.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/xiuxiu.web.meitu.com\/baidu\/","icon":"meitu.gif","width":"800","height":"570","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/美食天下.oexe b/data/User/demo/home/desktop/美食天下.oexe new file mode 100644 index 0000000..24f9619 --- /dev/null +++ b/data/User/demo/home/desktop/美食天下.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/home.meishichina.com\/app2baidu.php","icon":"meishi.png","width":"547","height":"590","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/虾米电台.oexe b/data/User/demo/home/desktop/虾米电台.oexe new file mode 100644 index 0000000..9c92a3f --- /dev/null +++ b/data/User/demo/home/desktop/虾米电台.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/kuang.xiami.com\/kuang\/play\/xiamiradio","icon":"xiami.jpg","width":"530","height":"282","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/计算器.oexe b/data/User/demo/home/desktop/计算器.oexe new file mode 100644 index 0000000..6b6cea2 --- /dev/null +++ b/data/User/demo/home/desktop/计算器.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/apps2.bdimg.com\/store\/static\/kvt\/3e9b470e8b9fceaa66d46a935b45518e.swf","icon":"calcu.png","width":"538","height":"600","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/豆瓣电台.oexe b/data/User/demo/home/desktop/豆瓣电台.oexe new file mode 100644 index 0000000..7a29661 --- /dev/null +++ b/data/User/demo/home/desktop/豆瓣电台.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/douban.fm\/partner\/qq_plus","icon":"douban.png","width":"545","height":"460","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/酷狗电台.oexe b/data/User/demo/home/desktop/酷狗电台.oexe new file mode 100644 index 0000000..85a6241 --- /dev/null +++ b/data/User/demo/home/desktop/酷狗电台.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/topic.kugou.com\/radio\/baiduNew.htm","icon":"kugou_radio.png","width":"554","height":"432","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/demo/home/desktop/音悦台.oexe b/data/User/demo/home/desktop/音悦台.oexe new file mode 100644 index 0000000..460e865 --- /dev/null +++ b/data/User/demo/home/desktop/音悦台.oexe @@ -0,0 +1 @@ +{"type":"url","content":"http:\/\/www.yinyuetai.com\/baidu\/index?bd_user=855814346&bd_sig=cac8830f2b6a731ab596413768b4606b&canvas_pos=platform","icon":"yingyuetai.png","width":"798","height":"450","simple":0,"resize":1} \ No newline at end of file diff --git a/data/User/index.html b/data/User/index.html new file mode 100644 index 0000000..e69de29 diff --git a/data/index.html b/data/index.html new file mode 100644 index 0000000..e69de29 diff --git a/data/system/group.php b/data/system/group.php index e0d16db..62fba30 100644 --- a/data/system/group.php +++ b/data/system/group.php @@ -1 +1 @@ -{"root":{"role":"root","name":"Administrator","path":"","ext_not_allow":""},"guest":{"role":"guest","name":"guest","ext_not_allow":"php|asp|jsp"},"default":{"role":"default","name":"default","ext_not_allow":"php|asp|jsp","explorer:mkdir":1,"explorer:mkfile":1,"explorer:pathDelete":1,"explorer:pathInfo":1,"explorer:serverDownload":1,"explorer:fileUpload":1,"explorer:search":1,"app:user_app":1,"editor:fileSave":1}} \ No newline at end of file +{"root":{"role":"root","name":"Administrator","path":"","ext_not_allow":""},"guest":{"role":"guest","name":"guest","ext_not_allow":"php|asp|jsp"},"default":{"role":"default","name":"default","ext_not_allow":"php|asp|jsp","explorer:mkdir":1,"explorer:mkfile":1,"explorer:pathRname":1,"explorer:pathDelete":1,"explorer:zip":1,"explorer:unzip":1,"explorer:pathCopy":1,"explorer:pathCute":1,"explorer:pathCuteDrag":1,"explorer:clipboard":1,"explorer:pathPast":1,"explorer:pathInfo":1,"explorer:serverDownload":1,"explorer:fileUpload":1,"explorer:search":1,"app:user_app":1,"editor:fileSave":1}} \ No newline at end of file diff --git a/lib/class/fileCache.class.php b/lib/class/fileCache.class.php index 17e75d4..fb8e9e9 100644 --- a/lib/class/fileCache.class.php +++ b/lib/class/fileCache.class.php @@ -212,6 +212,7 @@ class fileCache $str = file_get_contents($file); $str = substr($str, strlen(CONFIG_EXIT)); $data= json_decode($str,true); + if (is_null($data)) $data = array(); return $data; } /** diff --git a/lib/function/file.function.php b/lib/function/file.function.php index 1674e59..3bd3db3 100644 --- a/lib/function/file.function.php +++ b/lib/function/file.function.php @@ -459,7 +459,7 @@ function path_search($path,$search,$is_content=false,$file_ext='',$is_case=false * @return :string */ function chmod_path($path,$mod){ - $mod = 0777;// + //$mod = 0777;// if (!isset($mod)) $mod = 0777; if (!is_dir($path)) return chmod($path,$mod); if (!$dh = opendir($path)) return false; diff --git a/lib/index.html b/lib/index.html new file mode 100644 index 0000000..e69de29 diff --git a/lib/plugins/index.html b/lib/plugins/index.html new file mode 100644 index 0000000..e69de29 diff --git a/static/index.html b/static/index.html new file mode 100644 index 0000000..e69de29 diff --git a/static/js/_dev/common/core.js b/static/js/_dev/common/core.js index 4ca9041..755fdd0 100644 --- a/static/js/_dev/common/core.js +++ b/static/js/_dev/common/core.js @@ -181,8 +181,8 @@ define(function(require, exports) { //dlg.DOM.wrap.find('.aui_loading').remove(); }, setSkin:function(theme,css){ - var url = './../../../style/skin/'+theme+css; - var local = G.static_path+'style/skin/'+theme+css; + var url = './../../../style/skin/'+theme+css+'?ver='+G.version; + var local = G.static_path+'style/skin/'+theme+css+'?ver='+G.version; require.async(url,function(){ $("#link_css_list").attr("href",local); //加载完成后,删除多余link @@ -596,9 +596,9 @@ define(function(require, exports) { }).on('uploadError', function(file,reason){ $('#'+file.id).find(state).addClass('error').text(LNG.upload_error); }).on('uploadFinished', function(file){ - $(list).find('.item').delay(2000).each(function(index){ - $(this).delay(index*300).slideUp(600); - }); + // $(list).find('.item').delay(2000).each(function(index){ + // $(this).delay(index*300).slideUp(600); + // }); select_name_arr = []; if (Config.pageApp == 'explorer') { ui.tree.checkIfChange(G.this_path); diff --git a/static/js/_dev/common/pathOpen.js b/static/js/_dev/common/pathOpen.js index 7cedea7..05ff6ff 100644 --- a/static/js/_dev/common/pathOpen.js +++ b/static/js/_dev/common/pathOpen.js @@ -3,6 +3,7 @@ define(function(require, exports) { //或者打开指定文件 var _open = function(path,ext){ if (path == undefined) return; + if (ext == undefined) ext = core.pathExt(path);//没有扩展名则自动解析 ext = ext.toLowerCase(); if (ext == 'folder'){ @@ -132,6 +133,18 @@ define(function(require, exports) { } }; var _openOffice = function(url,ext){ + if (G.office_server !='') { + var office_url = G.office_server + urlEncode(url); + var title = core.pathThis(urlDecode(url)); + art.dialog.open(office_url,{ + ico:ico, + title:title,width:'70%', + height:'65%', + resize:true + }); + return; + } + var app_url,temp_url,frame,ico; switch (ext) { case 'doc': diff --git a/static/js/_dev/common/taskTap.js b/static/js/_dev/common/taskTap.js index a40f45d..ec060bf 100644 --- a/static/js/_dev/common/taskTap.js +++ b/static/js/_dev/common/taskTap.js @@ -174,7 +174,8 @@ define(function(require, exports) { } var _add = function(id,title){ $('.task_tab').removeClass('hidden'); - var html_tab = '
'+title+'
'; + var title_hover = title.replace(/<[^>]+>/g,""); + var html_tab = '
'+title+'
'; $(html_tab).insertBefore('.task_tab .last'); _resetWidth('add'); dialogs[id] = {id:id,name:name}; diff --git a/static/js/_dev/src/app/page.js b/static/js/_dev/src/app/page.js index 2c4ad7c..d91265f 100644 --- a/static/js/_dev/src/app/page.js +++ b/static/js/_dev/src/app/page.js @@ -25,7 +25,7 @@ define(function(require, exports) { url:geturl, type:'json', success:function(data){ - tips(data); + tips(data.data,data.code); } }); }); @@ -50,7 +50,7 @@ define(function(require, exports) { data:'data='+urlEncode(json_encode(data)), error:core.ajaxError, success:function(data){ - tips(data); + tips(data.data,data.code); if (!data.code) return; FrameCall.father('ui.f5',''); } @@ -66,7 +66,7 @@ define(function(require, exports) { dataType:'json', error:core.ajaxError, success:function(data){ - tips(data); + tips(data.data,data.code); if (!data.code) return; change(); } diff --git a/static/js/_dev/src/desktop/ui.js b/static/js/_dev/src/desktop/ui.js index 259c3e9..16ba90c 100644 --- a/static/js/_dev/src/desktop/ui.js +++ b/static/js/_dev/src/desktop/ui.js @@ -143,7 +143,7 @@ html+=""; }else{ html+=""; }else{ html+="