From a3ed155c909a2079e23ab9ce602d3bacf92abda9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <140248955+xiaohu2002@users.noreply.github.com> Date: Mon, 10 Feb 2025 16:05:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=EF=BC=9A?= =?UTF-8?q?=20(#284)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修复数据表格点击重置按钮后不按类型加载数据问题和添加刷新按钮 * 修复邮件发件人为空问题 * 修复分享文件在移动端无法打开文件夹问题 * 修复网盘应用在Linux环境下部分语言不能翻译的问题 * 重命名 dzz/explorer/language/zh-CN 为 dzz/explorer/language/zh-cn * 修改php版本要求 * 优化在线升级页面UI，网盘新增群组空间大小修改 * 修改php版本要求 * Update core_version.php --- README.md | 13 +- UPDATE.md | 2 +- admin/appmarket/upgrade_app_ajax.php | 17 +-- admin/member/template/lyear/verify.htm | 2 +- admin/system/systemupgrade.php | 32 ++-- admin/system/template/cron.htm | 2 +- admin/system/template/database.htm | 6 +- admin/system/template/lyear/upgrade.htm | 143 ++++++++++-------- admin/system/template/updatecache.htm | 2 +- dzz/explorer/groupmanage.php | 44 ++++++ .../language/{zh-CN => zh-cn}/index.htm | 0 .../language/{zh-CN => zh-cn}/lang.php | 2 +- dzz/explorer/template/groupmanage.htm | 36 ++++- dzz/shares/scripts/mobile/share.js | 2 +- dzz/shares/template/mobile/list.htm | 2 +- static/lyear/js/jquery.leftDrager.js | 20 +-- 16 files changed, 213 insertions(+), 112 deletions(-) rename dzz/explorer/language/{zh-CN => zh-cn}/index.htm (100%) rename dzz/explorer/language/{zh-CN => zh-cn}/lang.php (99%) diff --git a/README.md b/README.md index 6775bc9..64772ee 100644 --- a/README.md +++ b/README.md @@ -52,4 +52,15 @@ 5. 访问 http://您的域名/install/update.php。 6. 按照程序提示，直至所有升级完毕。删除install/update.php 程序，以免被恶意利用。 7. 管理员登录后，系统工具 -> 更新系统缓存。 -8. 系统设置 -> 打开站点。 \ No newline at end of file +8. 系统设置 -> 打开站点。 + +### 运行环境 +- 服务器: + - Windows，Linux，Mac ... + - PHP 7.0~8.0 + - 数据库: mysql 5.0+ +- 浏览器适配: + - Chrome + - Firefox + - Opera + - IE8+ \ No newline at end of file diff --git a/UPDATE.md b/UPDATE.md index b606408..bd5e53c 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -93,7 +93,7 @@ 2. 备份文件（如果有程序文件或风格文件的改动）； -3. 进入 管理 -> 系统工具 -> 在线更新，按提示完成更新任务； +3. 进入 管理 -> 系统工具 -> 在线更新，按提示完成更新； 4. 系统工具 -> 更新系统缓存； diff --git a/admin/appmarket/upgrade_app_ajax.php b/admin/appmarket/upgrade_app_ajax.php index c6cd3d4..a73f987 100644 --- a/admin/appmarket/upgrade_app_ajax.php +++ b/admin/appmarket/upgrade_app_ajax.php @@ -328,7 +328,7 @@ elseif($operation == 'cross' || $operation == 'patch'){ $return["second"]=1; exit(json_encode($return)); } - elseif($step == 3) { + elseif($step == 3) { $return["percent"]=55; $return["second"]=300; $return["msg"]= lang('app_upgrade_newversion_ing' ); @@ -369,7 +369,7 @@ elseif($operation == 'cross' || $operation == 'patch'){ elseif($step==4){ $return["percent"]=80; $return["second"]=3000; - $return["msg"]=lang('app_upgrade_newversion_ing' ); + $return["msg"]=lang('app_upgrade_newversion_ing'); $return["step"]=4; $updatefilelist = $dzz_upgrade->fetch_updatefile_list_bymd5($appinfo); @@ -399,7 +399,7 @@ elseif($operation == 'cross' || $operation == 'patch'){ $paraftp .= '&siteftp[' . $k . ']=' . $v; } } - + if(!$_GET['startupgrade']) { if (!$_GET['backfile']) { $linkurl = $theurl . '&step=4&backfile=1&confirm=' . $confirm . $paraftp; @@ -463,8 +463,8 @@ elseif($operation == 'cross' || $operation == 'patch'){ $return["msg"]=lang('app_upgrade_file_success', array( 'upgradeurl' => upgradeinformation_app(4))); exit(json_encode($return)); } - - if($_GET['dodabase']){ + + if($_GET['dodabase']){ $finish = FALSE; $dir = $appinfo['app_path']; $appname = $appinfo['identifier']; @@ -483,11 +483,11 @@ elseif($operation == 'cross' || $operation == 'patch'){ }else{ @rename($importfile2,$importfile); } - } + } $importtxt = @implode('', file($importfile)); $apparray = getimportdata('Dzz! app'); - $filename = $apparray['app']['extra']['upgradefile']; + $filename = $apparray['app']['extra']['upgradefile']; if (!empty($filename) && preg_match('/^[\w\.]+$/', $filename)) { $filename = DZZ_ROOT . './'.$dir.'/' . $appname . '/' . $filename; if (file_exists($filename)) { @@ -526,7 +526,6 @@ elseif($operation == 'cross' || $operation == 'patch'){ $return["msg"]=lang('app_upgrade_database_success', array( 'upgradeurl' => upgradeinformation_app(5))); exit(json_encode($return)); } - $linkurl = ADMINSCRIPT . '?mod=appmarket&op=upgrade_app_ajax&operation=' . $operation . '&appid=' .$appid. '&step=5&confirm=' . $confirm; $return["url"]=$linkurl; @@ -536,7 +535,7 @@ elseif($operation == 'cross' || $operation == 'patch'){ $return["msg"]=lang('app_upgrade_newversion_will_success'); exit(json_encode($return)); } - elseif($step==5){ + elseif($step==5){ //删除更新文件列表tmp临时文件 $srcfile = DZZ_ROOT .$appinfo['app_path'].'/' . $appinfo['identifier'].'/updatelist.tmp'; if (file_exists($srcfile)) { diff --git a/admin/member/template/lyear/verify.htm b/admin/member/template/lyear/verify.htm index 7f0abf8..e7f4db1 100644 --- a/admin/member/template/lyear/verify.htm +++ b/admin/member/template/lyear/verify.htm @@ -224,4 +224,4 @@ - + \ No newline at end of file diff --git a/admin/system/systemupgrade.php b/admin/system/systemupgrade.php index c33f2f4..8e3d567 100644 --- a/admin/system/systemupgrade.php +++ b/admin/system/systemupgrade.php @@ -29,7 +29,7 @@ if ($operation == 'patch' || $operation == 'cross') { $msg .= '

'; $msg .= "

"; if (!$_GET['iframe']) { include template('upgrade'); @@ -88,7 +88,7 @@ if ($operation == 'patch' || $operation == 'cross') { if (!$upgradeinfo) { $msg = '

' . lang('upgrade_none', array('upgradeurl' => upgradeinformation(-1))) . '

'; $msg .= "

"; if (!$_GET['iframe']) { include template('upgrade'); @@ -107,7 +107,7 @@ if ($operation == 'patch' || $operation == 'cross') { if (empty($updatefilelist)) { $msg = '

' . lang('upgrade_download_upgradelist_error', array('upgradeurl' => upgradeinformation(-2))) . '

'; $msg .= ''; - $msg .= '

' . lang('message_redirect') . '

'; + $msg .= '

' . lang('message_redirect') . '

'; if (!$_GET['iframe']) { include template('upgrade'); exit(); @@ -137,10 +137,10 @@ if ($operation == 'patch' || $operation == 'cross') { $msg = lang('upgrade_download_complete_to_compare', array('upgradeurl' => upgradeinformation(0))); if (!$_GET['iframe']) { $msg .= ''; - $msg .= '

' . lang('message_redirect') . '

'; + $msg .= '

' . lang('message_redirect') . '

'; } else { $msg .= ''; - $msg .= '

' . lang('message_redirect') . '

'; + $msg .= '

' . lang('message_redirect') . '

'; include template('upgrade_iframe'); exit(); } @@ -153,12 +153,12 @@ if ($operation == 'patch' || $operation == 'cross') { if ($downloadstatus == 1) { $linkurl = $theurl . '&step=2&fileseq=' . $fileseq . '&iframe=1'; $msg = lang('upgrade_downloading_file', array('file' => $updatefilelist[$fileseq - 1], 'percent' => sprintf("%2d", 100 * $fileseq / count($updatefilelist)) . '%', 'upgradeurl' => upgradeinformation(1))) . ''; - $msg .= '

' . lang('message_redirect') . '

'; + $msg .= '

' . lang('message_redirect') . '

'; } elseif ($downloadstatus == 2) { $linkurl = $theurl . '&step=2&fileseq=' . ($fileseq + 1) . '&iframe=1'; $msg = '

' . lang('upgrade_downloading_file', array('file' => $updatefilelist[$fileseq - 1], 'percent' => sprintf("%2d", 100 * $fileseq / count($updatefilelist)) . '%', 'upgradeurl' => upgradeinformation(1))) . '

'; - $msg .= '

' . lang('message_redirect') . '

'; + $msg .= '

' . lang('message_redirect') . '

'; } else { $linkurl = $theurl . '&step=2&fileseq=' . ($fileseq) . '&iframe=1'; $msg = '

' . lang('upgrade_redownload', array('file' => $updatefilelist[$fileseq - 1], 'upgradeurl' => upgradeinformation(-3))) . '

'; @@ -200,7 +200,7 @@ if ($operation == 'patch' || $operation == 'cross') { $msg .= '

'; $msg .= '  

'; $msg .= ""; include template('upgrade'); exit(); @@ -218,7 +218,7 @@ if ($operation == 'patch' || $operation == 'cross') { $linkurl = $theurl . '&step=4&backfile=1&confirm=' . $confirm . $paraftp; $msg = '

' . lang('upgrade_backuping', array('upgradeurl' => upgradeinformation(2))) . '

'; $msg .= ''; - $msg .= '

' . lang('message_redirect') . '

'; + $msg .= '

' . lang('message_redirect') . '

'; include template('upgrade'); exit(); } @@ -229,7 +229,7 @@ if ($operation == 'patch' || $operation == 'cross') { if (!$dzz_upgrade -> copy_file($destfile, $backfile, 'file')) { $msg = '

' . lang('upgrade_backup_error', array('upgradeurl' => upgradeinformation(-5))) . '

'; $msg .= "

"; include template('upgrade'); exit(); @@ -238,7 +238,7 @@ if ($operation == 'patch' || $operation == 'cross') { } $msg = '

' . lang('upgrade_backup_complete', array('upgradeurl' => upgradeinformation(3))) . '

'; $msg .= ''; - $msg .= '

' . lang('message_redirect') . '

'; + $msg .= '

' . lang('message_redirect') . '

'; include template('upgrade'); exit(); } @@ -258,7 +258,7 @@ if ($operation == 'patch' || $operation == 'cross') { $msg .= '

'; $msg .= ' 

'; $msg .= "

"; include template('upgrade'); exit(); @@ -268,7 +268,7 @@ if ($operation == 'patch' || $operation == 'cross') { $msg .= '

'; $msg .= ' 

'; $msg .= "

"; include template('upgrade'); exit(); @@ -292,7 +292,7 @@ if ($operation == 'patch' || $operation == 'cross') { $msg .= '

'; $msg .= ' 

'; $msg .= "

"; include template('upgrade'); exit(); @@ -302,7 +302,7 @@ if ($operation == 'patch' || $operation == 'cross') { $msg .= '

'; $msg .= ' 

'; $msg .= "

"; include template('upgrade'); exit(); @@ -316,7 +316,7 @@ if ($operation == 'patch' || $operation == 'cross') { $linkurl = $_G['siteurl'] . 'install/update.php?step=prepare&from=' . rawurlencode($dbreturnurl) . '&frommd5=' . rawurlencode(md5($dbreturnurl . $_G['config']['security']['authkey'])); $msg = '

' . lang('upgrade_file_successful', array('upgradeurl' => upgradeinformation(4))) . '

'; $msg .= ''; - $msg .= '

' . lang('message_redirect') . '

'; + $msg .= '

' . lang('message_redirect') . '

'; include template('upgrade'); exit(); diff --git a/admin/system/template/cron.htm b/admin/system/template/cron.htm index 510c05c..ec88d08 100644 --- a/admin/system/template/cron.htm +++ b/admin/system/template/cron.htm @@ -41,7 +41,7 @@

$msg

- {lang message_redirect} + {lang message_redirect}

diff --git a/admin/system/template/database.htm b/admin/system/template/database.htm index d04556f..c9ee09d 100644 --- a/admin/system/template/database.htm +++ b/admin/system/template/database.htm @@ -101,7 +101,7 @@

- {lang message_redirect} + {lang message_redirect}

@@ -115,7 +115,7 @@

$msg

- {lang message_redirect} + {lang message_redirect}

@@ -205,7 +205,7 @@

$msg

- {lang message_redirect} + {lang message_redirect}

diff --git a/admin/system/template/lyear/upgrade.htm b/admin/system/template/lyear/upgrade.htm index 7c48b46..8390772 100644 --- a/admin/system/template/lyear/upgrade.htm +++ b/admin/system/template/lyear/upgrade.htm @@ -5,12 +5,18 @@
-
{lang upgrade}
- - - style="color:green">{$key}.{$value} - - +
+ {lang upgrade} + +
@@ -82,7 +88,7 @@ - + @@ -109,10 +115,10 @@ -
-
{lang founder_upgrade_diff_show}
-
+
+ {lang founder_upgrade_diff_show} +
     $value     $value
@@ -120,15 +126,15 @@ - + - + - + @@ -157,68 +163,85 @@
-
+ -

{lang upgrade_website_FTP_set}

-
- - - {lang FTP_server_IP_site_domain} +

{lang upgrade_website_FTP_set}

+
+ +
+ + {lang FTP_server_IP_site_domain} +
-
- - - {lang default_for_the_21st} +
+ +
+ + {lang default_for_the_21st} +
-
- - - {lang accounts_supreme_authority} +
+ +
+ + {lang accounts_supreme_authority} +
-
- - - +
+ +
+ +
- -
- - - {lang site_absolute_path_root_directory} +
+ +
+ + {lang site_absolute_path_root_directory} +
-
- - - {lang general_condition_passive_mode} +
+ +
+
+ + +
+ {lang general_condition_passive_mode} +
-
- - - {lang notice_FTP_open_SSL} +
+ +
+
+ + +
+ {lang notice_FTP_open_SSL} +
-
- - +
+
-
-
- $msg -
+
+ $msg
@@ -228,7 +251,7 @@ \ No newline at end of file diff --git a/admin/system/template/updatecache.htm b/admin/system/template/updatecache.htm index 4933af6..7d17dce 100644 --- a/admin/system/template/updatecache.htm +++ b/admin/system/template/updatecache.htm @@ -46,7 +46,7 @@

{lang tools_updatecache_waiting}

- {lang message_redirect} + {lang message_redirect}

diff --git a/dzz/explorer/groupmanage.php b/dzz/explorer/groupmanage.php index 98c7fea..5bac419 100644 --- a/dzz/explorer/groupmanage.php +++ b/dzz/explorer/groupmanage.php @@ -90,6 +90,50 @@ if($do == 'filelist'){ } } require template('group_list'); +}elseif($do=='folder_maxspacesize'){ + $orgid=intval($_GET['orgid']); + $setspacesize = intval($_GET['maxspacesize']); + if(!$org=C::t('organization')->fetch($orgid)){ + exit(json_encode(array('error'=>'该机构或群组不存在或被删除'))); + } + //暂时只允许系统管理员进行空间相关设置 + if($_G['adminid'] != 1){ + exit(json_encode(array('error'=>'没有权限'))); + } + if($setspacesize != 0){ + + //获取允许设置的空间值 + $allowallotspace = C::t('organization')->get_allowallotspacesize_by_orgid($orgid); + + if($allowallotspace < 0) { + exit(json_encode(array('error' => '可分配空间不足'))); + } + + //获取当前已占用空间大小 + $currentallotspace = C::t('organization')->get_orgallotspace_by_orgid($orgid,0,false); + //设置值小于当前下级分配总空间值即：当前设置值 < 下级分配总空间 + if($setspacesize > 0 && $setspacesize*1024*1024 < $currentallotspace){ + + exit(json_encode(array('error'=>'设置空间值不足,小于已分配空间值！','val'=>$org['maxspacesize']))); + + } + //上级包含空间限制时，无限制不处理，直接更改设置值 + if($allowallotspace > 0 && ($setspacesize*1024*1024 > $allowallotspace)){ + + exit(json_encode(array('error'=>'总空间不足！','val'=>$org['maxspacesize']))); + + } + } + + //设置新的空间值 + if(C::t('organization')->update($orgid,array('maxspacesize'=>$setspacesize))){ + + exit(json_encode(array('msg'=>'success'))); + + }else{ + exit(json_encode(array('error'=>'设置不成功或未更改','val'=>$org['maxspacesize']))); + } + }elseif($do == 'groupmanage'){ $gids = isset($_GET['gid']) ? $_GET['gid']:''; if(!$orgs = DB::fetch_all("select * from %t where orgid in(%n)",array('organization',$gids))){ diff --git a/dzz/explorer/language/zh-CN/index.htm b/dzz/explorer/language/zh-cn/index.htm similarity index 100% rename from dzz/explorer/language/zh-CN/index.htm rename to dzz/explorer/language/zh-cn/index.htm diff --git a/dzz/explorer/language/zh-CN/lang.php b/dzz/explorer/language/zh-cn/lang.php similarity index 99% rename from dzz/explorer/language/zh-CN/lang.php rename to dzz/explorer/language/zh-cn/lang.php index 7daf61e..6c80682 100644 --- a/dzz/explorer/language/zh-CN/lang.php +++ b/dzz/explorer/language/zh-cn/lang.php @@ -279,7 +279,7 @@ $lang = array( 'my_involved' => '我参与的', 'group_name' => '群组名称', 'creater' => '创建者', - 'create_date' => '创建日期', + 'create_date' => '创建时间', 'function_management' => '功能管理', 'groups_management' => '群组管理', 'update_finish' => '上传完成', diff --git a/dzz/explorer/template/groupmanage.htm b/dzz/explorer/template/groupmanage.htm index 520096c..99a403d 100644 --- a/dzz/explorer/template/groupmanage.htm +++ b/dzz/explorer/template/groupmanage.htm @@ -67,6 +67,11 @@ {lang group_file}
--> +
    {lang founder_upgrade_diff}   $v    {lang founder_upgrade_diff}   $v
    {lang founder_upgrade_normal}   $v    {lang founder_upgrade_normal}   $v
    {lang founder_upgrade_new}   $v    {lang founder_upgrade_new}   $v
+
+ 空间 +
+
{lang group} @@ -81,10 +86,10 @@ - +
-
+
{eval echo avatar_group($v['orgid']);} @@ -102,7 +107,13 @@ $v[usernum]
- {eval echo dgmdate($v['dateline'],'Y-m-d');} + {eval echo dgmdate($v['dateline']);} + +
+ + M +
checked="checked" @@ -140,6 +151,17 @@ InputAnimate.init($(this)); }); }); + function folder_maxspacesize(obj,orgid){ + jQuery.post(MOD_URL+'&op=groupmanage&do=folder_maxspacesize',{'orgid':orgid,'maxspacesize':obj.value,'t':new Date().getTime()},function(json){ + if(json.error){ + obj.value=json.val; + showmessage(json.error,'danger',3000,1); + }else{ + jQuery('#'+orgid+' a.jstree-clicked').trigger('click'); + showmessage('空间大小设置成功','success',3000,1); + } + },'json'); + } //群组共享开启关闭 $(document).off('change.sysdiron').on('change.sysdiron','#memberlist .sysdiron',function(){ var obj = $(this); @@ -151,9 +173,9 @@ showmessage('{lang do_successed_wait_update_datas}', 'success', 3000, 1, 'right-bottom'); // showDialog('{lang do_successed_wait_update_datas}', 'right'); obj.val(diron); - /*setTimeout(function () { + setTimeout(function () { location.reload(); - }, 2000);*/ + }, 2000); } else { showmessage(data['error'], 'error', 3000, 1, 'right-bottom'); // showDialog(data['error']); @@ -171,9 +193,9 @@ showmessage('{lang do_successed_wait_update_datas}', 'success', 3000, 1, 'right-bottom'); // showDialog('{lang do_successed_wait_update_datas}', 'right'); obj.val(groupon); - /*setTimeout(function () { + setTimeout(function () { location.reload(); - }, 2000);*/ + }, 2000); // showmessage('{lang do_successed_wait_update_datas}', 'info', 3000, 1, 'right-bottom'); } else { showmessage(data['error'], 'error', 3000, 1, 'right-bottom'); diff --git a/dzz/shares/scripts/mobile/share.js b/dzz/shares/scripts/mobile/share.js index 9baebbb..6163921 100644 --- a/dzz/shares/scripts/mobile/share.js +++ b/dzz/shares/scripts/mobile/share.js @@ -48,7 +48,7 @@ $(document).off('tap.openfolder').on('tap.openfolder', '.folderlist', function ( select_file(obj); return false; } else { - $.post(MOD_URL + '&op=ajax', {path: dhpath, currentfolder: 0}, function (data) { + $.post(MOD_URL + '&op=ajax', {path: dhpath, currentfolder: 0,sid: sid}, function (data) { $('#dataContainer').html(data); $('#filelist').html($('#dataContainer').find('.module-list').html()); $($('#dataContainer').find('.breadcrumb-data:first').html()).insertAfter($('.breadcrumb li').last()); diff --git a/dzz/shares/template/mobile/list.htm b/dzz/shares/template/mobile/list.htm index 661f0e8..9a5e932 100644 --- a/dzz/shares/template/mobile/list.htm +++ b/dzz/shares/template/mobile/list.htm @@ -70,7 +70,7 @@