Skip to content

Commit

Permalink
version 4.39 release
Browse files Browse the repository at this point in the history
  • Loading branch information
kalcaddle committed Mar 1, 2019
1 parent 538bb10 commit d21827b
Show file tree
Hide file tree
Showing 33 changed files with 85 additions and 52 deletions.
13 changes: 13 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
### ver4.39 `2019/3/1`
-----
#### update:
- 桌面打开文件夹对话框,不同窗口文件相互剪切粘贴,自动同步窗口文件列表状态。
- 解压到选择文件夹时;自动判断当前文件夹是否可写入;不可写则不可选择当前文件夹
- 验证码固定为4位

#### fix bug
- 解决APP中文本文件预览问题
- 桌面压缩文件解压功能异常问题修复;
- 桌面文件夹中含有#*&字符的文件夹,打开路径错误问题修复;


### ver4.38 `2019/2/25`
-----
#### update:
Expand Down
3 changes: 3 additions & 0 deletions app/controller/explorer.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,9 @@ public function zip($zipPath='',$namePre = "",$checkSpaceChange = true){
public function unzip(){
ignore_timeout();
$path = $this->path;
if(!file_exists($path)){
show_json(LNG("not_exists"),false);
}
$name = get_path_this($path);
$name = substr($name,0,strrpos($name,'.'));
$ext = get_path_ext($path);
Expand Down
8 changes: 4 additions & 4 deletions app/controller/systemMember.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,23 @@ public static function getInfo($theId){
/**
* 空间使用变更
* @param [type] $theId [userID or groupID]
* @param [type] $Sizeadd [变更的大小 sizeMax G为单位 sizeUse Byte为单位]
* @param [type] $sizeAdd [变更的大小 sizeMax G为单位 sizeUse Byte为单位]
*/
public static function spaceChange($theId,$Sizeadd=false){
public static function spaceChange($theId,$sizeAdd=false){
$sql = self::loadData();
$info = $sql->get($theId);
if(!is_array($info)){
show_json(LNG('data_not_full'),false);
}
if($Sizeadd===false){//重置用户空间;避免覆盖、解压等导致的问题
if($sizeAdd===false){//重置用户空间;避免覆盖、解压等导致的问题
$pathinfo = _path_info_more(iconv_system(USER_PATH.$info['path'].'/'));
$currentUse = $pathinfo['size'];
if(isset($info['homePath']) && file_exists(iconv_system($info['homePath']))){
$pathinfo = _path_info_more(iconv_system($info['homePath']));
$currentUse += $pathinfo['size'];
}
}else{
$currentUse = floatval($info['config']['sizeUse'])+floatval($Sizeadd);
$currentUse = floatval($info['config']['sizeUse'])+floatval($sizeAdd);
}
$info['config']['sizeUse'] = $currentUse<0?0:$currentUse;
$sql->set($theId,$info);
Expand Down
2 changes: 1 addition & 1 deletion app/controller/user.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ public function authCheck(){
}
public function checkCode() {
session_start();//re start
$captcha = new MyCaptcha(mt_rand(3,4));
$captcha = new MyCaptcha(4);
$_SESSION['checkCode'] = $captcha->getString();
}

Expand Down
2 changes: 1 addition & 1 deletion app/controller/utils.php

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/template/api/view.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
mtime:0,
size:0
}
<?php if(ST.'.'.ACT == 'explorer.fileView'){echo "G.shareInfo.view = true;";}?>
<?php if(ST.'.'.ACT == 'explorer.fileView'){echo "G.shareInfo.view = true;G.sharePage=undefined;";}?>
G['accessToken'] = "<?php echo access_token_get();?>";
seajs.config({
base: "<?php echo STATIC_PATH;?>js/",
Expand Down
2 changes: 1 addition & 1 deletion config/version.php
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?php
define('KOD_VERSION','4.38');
define('KOD_VERSION','4.39');
2 changes: 1 addition & 1 deletion plugins/DPlayer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id":"DPlayer",
"name":"DPlayer播放器",
"title":"DPlayer播放器",
"version":"1.05",
"version":"1.07",
"source":{
"icon":"{{pluginHost}}static/images/icon.png",
},
Expand Down
5 changes: 5 additions & 0 deletions plugins/DPlayer/static/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ kodReady.push(function(){
});
window.DplayerSubtitle = parseInt("{{config.subtitle}}");

//临时兼容4.38及以前版本;APP预览txt校验权限失败问题;
if (G.ACT + '.' + G.ST == 'view.api' && !G.user){
G.sharePage = undefined;
$.addStyle('.ace_editor{font-size:13px !important;}');
}

/**
* 临时修复文件夹右键新窗口打开异常问题;<=4.32
Expand Down
2 changes: 1 addition & 1 deletion plugins/toolsCommon/static/pie/.pie.tif

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions plugins/zipView/static/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ kodReady.push(function(){
}
return url;
}

//测试 替换分享链接地址;
// Hook.bind('explorer.path.share.uiInitStart',function(){
// G.appHostTemp = G.appHost;
// G.appHost = "http://test.com/";
// console.log(G.appHost);
// });
// Hook.bind('explorer.path.share.uiInit',function(){
// G.appHost = G.appHostTemp;
// });


kodApp.add({
name:"zipView",
title:"{{LNG.Plugin.default.zipView}}",
Expand Down
2 changes: 1 addition & 1 deletion plugins/zipView/static/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ define(function(require, exports) {
var unZip = function(createFolder){
if(!ui.path.checkSystemPath()) return;
var oprate = ui.path.pathOperate;
ui.pathOperate.unZip(ui.path.makeParam().path,ui.f5,createFolder);
oprate.unZip(ui.path.makeParam().path,ui.f5,createFolder);
};
switch(action){
case 'zip-zip': zip();break;
Expand Down
4 changes: 2 additions & 2 deletions static/js/app/src/api/default/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app/src/api/view/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app/src/app/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app/src/desktop/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app/src/edit/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app/src/editor/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app/src/explorer/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app/src/explorerWap/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app/src/plugins/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app/src/setting/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app/src/shareEditor/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app/src/shareExplorer/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app/src/shareIndex/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app/src/user/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/js/lib/webuploader/webuploader-min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions static/style/skin/base/app_code_edit.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/style/skin/base/app_desktop.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/style/skin/base/app_editor.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions static/style/skin/base/app_explorer.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/style/skin/base/app_setting.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/style/skin/base/common.css

Large diffs are not rendered by default.

0 comments on commit d21827b

Please sign in to comment.