From a05b4da81e2bdc1b2efeda5bfdc868b9f0c2ddff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com> Date: Wed, 1 Feb 2023 18:59:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=B3V1.73=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=E5=9C=A8=E7=AC=94=E8=AE=B0?= =?UTF-8?q?=E4=B8=AD=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/cloud/template/oauth_ALIOSS.htm | 8 --- admin/cloud/template/oauth_disk.htm | 8 --- admin/cloud/template/oauth_ftp.htm | 11 ---- admin/cloud/template/oauth_qcos.htm | 8 --- admin/cloud/template/oauth_qiniu.htm | 11 ---- core/class/dzz/dzz_app.php | 13 +++-- core/template/default/common/header_right.htm | 14 ++++- dzz/filemanage/images/folder.css | 27 +++++---- dzz/filemanage/images/mobile_folder.css | 1 - dzz/filemanage/index.php | 12 +++- dzz/filemanage/language/en-US/lang.php | 3 +- dzz/filemanage/language/zh-cn/lang.php | 1 + dzz/filemanage/template/list.htm | 56 +++++++++++++------ dzz/filemanage/template/mobile_list.htm | 4 +- user/profile/index.php | 10 +++- user/profile/template/left.htm | 9 +-- 16 files changed, 101 insertions(+), 95 deletions(-) diff --git a/admin/cloud/template/oauth_ALIOSS.htm b/admin/cloud/template/oauth_ALIOSS.htm index 9a91fe5..924de3f 100644 --- a/admin/cloud/template/oauth_ALIOSS.htm +++ b/admin/cloud/template/oauth_ALIOSS.htm @@ -1,14 +1,6 @@ -
diff --git a/admin/cloud/template/oauth_disk.htm b/admin/cloud/template/oauth_disk.htm index ab4bdbc..523b55b 100644 --- a/admin/cloud/template/oauth_disk.htm +++ b/admin/cloud/template/oauth_disk.htm @@ -1,14 +1,6 @@ -
diff --git a/admin/cloud/template/oauth_ftp.htm b/admin/cloud/template/oauth_ftp.htm index 3781d60..c50f302 100644 --- a/admin/cloud/template/oauth_ftp.htm +++ b/admin/cloud/template/oauth_ftp.htm @@ -1,17 +1,6 @@ -
diff --git a/admin/cloud/template/oauth_qcos.htm b/admin/cloud/template/oauth_qcos.htm index 30f7a3e..4c90ef8 100644 --- a/admin/cloud/template/oauth_qcos.htm +++ b/admin/cloud/template/oauth_qcos.htm @@ -1,14 +1,6 @@ -
diff --git a/admin/cloud/template/oauth_qiniu.htm b/admin/cloud/template/oauth_qiniu.htm index 02d6df7..c9d0e4a 100644 --- a/admin/cloud/template/oauth_qiniu.htm +++ b/admin/cloud/template/oauth_qiniu.htm @@ -1,17 +1,6 @@ -
diff --git a/core/class/dzz/dzz_app.php b/core/class/dzz/dzz_app.php index d825003..8d552c9 100644 --- a/core/class/dzz/dzz_app.php +++ b/core/class/dzz/dzz_app.php @@ -572,14 +572,15 @@ class dzz_app extends dzz_base{ } } - if ($this->var['member']['adminid']==1){ + if ($this->var['member']['adminid']){ }elseif(in_array(CURSCRIPT, array('admin', 'user', 'api')) || defined('ALLOWGUEST') && ALLOWGUEST) { - }else{ + }elseif($_GET['mod']=='system') { + }else{ if ($this->var['member']['uid']){ foreach($this->var['setting']['verify'] as $key=>$value){ $verify = C::t('user_verify')->fetch($this->var['member']['uid']); if($value['available'] && $key==1){ - if($verify['verify1']){ + if($verify['verify1']==1){ }else { dheader("Location: user.php?mod=profile&vid=1"); } @@ -596,14 +597,16 @@ class dzz_app extends dzz_base{ if ($this->var['member']['uid']){ showmessage(lang('您无权使用该应用,请联系管理员。')); } - }else{ + }elseif ($this->var['member']['uid']){ $appuid= C::t('user_field')->fetch($this->var['member']['uid']); $appuidz=explode(',',$appuid['applist']); if (in_array($appidxu['appid'],$appuidz)){ }else{ showmessage(lang('您无权使用该应用,请联系管理员。')); } - } + }else{ + Hook::listen('check_login'); + } } if(isset($this->var['setting']['nocacheheaders']) && $this->var['setting']['nocacheheaders']) { @header("Expires: -1"); diff --git a/core/template/default/common/header_right.htm b/core/template/default/common/header_right.htm index d2a1ae9..85593e9 100644 --- a/core/template/default/common/header_right.htm +++ b/core/template/default/common/header_right.htm @@ -1,8 +1,18 @@
- +
{lang filename}
-
{lang file_size}
-
{lang file_type}
+
{lang file_size} + +
+
{lang file_type} + +
{lang file_location}
{lang possessor}
-
引用
{lang add_time}
{lang delete}
@@ -142,8 +145,9 @@
- -
data-containpath="$value[oid]" data-type="$value[type]" class="item shareblock clearfix"> + +
data-containpath="$value[oid]" data-type="$value[type]" class="item shareblock clearfix"> +
@@ -156,23 +160,39 @@ data-original="$value[url]" data-dpath="$value[dpath]" /> - $value[name]
- -
- -
- + $value[name] +
+
+ +
-
$value[fsize]
+
$value[fsize]
$value[ftype]
$value[relpath]
$value[username]
-
$value[copys]
-
+
+ +
+
+ + +
+
+ 文件位置: +
+
+ 直链地址: +
+
+ 引用:$value[copys] +
+
+ +
@@ -218,6 +238,7 @@ var theurl='$theurl'; jQuery(this).removeClass('item-hover'); }); + jQuery(document).on('click', 'span[node-type=name-text],.module-grid-view .item', function() { var item = jQuery(this).closest('.item'); var type = item.data('type'); @@ -242,13 +263,13 @@ var theurl='$theurl'; } return false; }); - jQuery('.title .item .col[node-type=title-col][data-key=dateline],.title .item .col[node-type=title-col][data-key=size]').on('click', function() { + jQuery('.title .item .col[node-type=title-col][data-key=dateline],.title .item .col[node-type=title-col][data-key=size],.title .item .col[node-type=title-col][data-key=ftype]').on('click', function() { var el = jQuery(this); el.find('.asc').css('visibility', 'visible').toggleClass('desc'); el.siblings().find('.asc').css('visibility', 'hidden'); var param=el.data('key')+'='+ (el.find('.asc').hasClass('desc') ? 'desc' : 'asc'); - var regx=new RegExp('&(dateline|size)=(asc|desc)','i'); + var regx=new RegExp('&(dateline|size|ftype)=(asc|desc)','i'); var url=theurl.replace(regx,'')+'&'+param; location.href=correcturl(url); }); @@ -276,7 +297,6 @@ jQuery(document).off('click.shareclick').on('click.shareclick',".shareblock",fun if(checkinput.prop('checked')){ checkinput.prop('checked',false); jQuery(this).removeClass('item-active'); - var rid=jQuery(this).find('input[name="del[]"]').data('rid'); var index = jQuery.inArray(rid,rids); if(index != -1){ diff --git a/dzz/filemanage/template/mobile_list.htm b/dzz/filemanage/template/mobile_list.htm index 16dbe1a..5c23fae 100644 --- a/dzz/filemanage/template/mobile_list.htm +++ b/dzz/filemanage/template/mobile_list.htm @@ -87,7 +87,7 @@ - +