Skip to content

Commit

Permalink
version 4.35 release, 兼容老版本自动升级
Browse files Browse the repository at this point in the history
  • Loading branch information
kalcaddle committed Sep 5, 2018
1 parent 71b68f3 commit f184f3e
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 16 deletions.
3 changes: 2 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
### ver4.34 `2018/09/5`
### ver4.35 `2018/09/5`
-----
#### update:
- 新建文件,不同排序字段及排序方式,新建文件插入位置优化。
- 子目录集成副部们权限优化
- 细节样式等优化
- 兼容老版本(4.0一下)升级

#### fix bug
- 压缩文件夹预览,没有写权限也允许查看(个人可查看部门压缩文件内容)
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/kod/FileCache.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public function getMaxId(){
public static function load($file){//10000次需要4s 数据量差异不大。
if (!$file) return false;
$file = iconv_system($file);
if ( !file_exists($file) || filesize($file) == 0 ){
if ( !file_exists($file) ){
@file_put_contents($file,CONFIG_EXIT.'[]');
chmod_path($file,0777);
return array();
Expand Down
25 changes: 24 additions & 1 deletion app/update.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function updateCheck(){
//from <=3.23 to 3.30
if( file_exists(THE_DATA_PATH.'system/member.php') &&
!file_exists(THE_DATA_PATH.'system/system_member.php')){
new UpdateToV330();
new updateToV330();
}

//from [3.30~3.36] //还原用户目录
Expand Down Expand Up @@ -230,6 +230,17 @@ function initMember(){
}
}
function initUser($userPath){
$checkFile = array(
$userPath.'config.php',
$userPath.'fav.php',
$userPath.'share.php'
);
foreach ($checkFile as $item) {
if(file_exists($item) && filesize($item) == 0 ){
@unlink($item);
}
}

$this->parseFile($userPath.'config.php');
$this->parseFile($userPath.'editor_config.php');
$this->parseFile($userPath.'share.php',true);
Expand Down Expand Up @@ -459,6 +470,18 @@ private function reset_user_config(&$user){
mk_dir($user_path.'home/document');
mk_dir($user_path.'home/pictures');
}

$userPath = $user_path.'data/';
$checkFile = array(
$userPath.'config.php',
$userPath.'fav.php',
$userPath.'share.php'
);
foreach ($checkFile as $item) {
if(file_exists($item) && filesize($item) == 0 ){
@unlink($item);
}
}
mk_dir($user_path.'recycle');
if(!is_array($data) || count($data)<4){
$data = $GLOBALS['config']['settingSystemDefault'];
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.34');
define('KOD_VERSION','4.35');
2 changes: 1 addition & 1 deletion plugins/toolsCommon/static/pie/.pie.tif

Large diffs are not rendered by default.

4 changes: 2 additions & 2 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.

0 comments on commit f184f3e

Please sign in to comment.