From 6bfb17dbfd34fba4c22bea90274bcc8045dbfbb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com> Date: Tue, 31 Jan 2023 16:43:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=B3V1.72=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/appmarket/images/market.css | 3 +-- admin/appmarket/template/upgrade.htm | 10 +++++----- admin/setting/language/en-US/lang.php | 1 + admin/setting/language/zh-cn/lang.php | 1 + admin/setting/template/main.htm | 2 +- core/class/dzz/dzz_app.php | 20 ++++++++++---------- core/class/perm/perm_check.php | 1 - core/class/table/table_folder.php | 1 + core/class/table/table_resources_statis.php | 2 +- core/core_version.php | 6 +++--- dzz/images/extimg/docxf.png | Bin 0 -> 1786 bytes dzz/images/newfile/new.docxf | Bin 0 -> 6957 bytes static/css/app_manage.css | 1 + static/css/quanju.css | 6 +++++- 14 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 dzz/images/extimg/docxf.png create mode 100644 dzz/images/newfile/new.docxf diff --git a/admin/appmarket/images/market.css b/admin/appmarket/images/market.css index ef08e45..5485f20 100644 --- a/admin/appmarket/images/market.css +++ b/admin/appmarket/images/market.css @@ -305,8 +305,7 @@ span.num { /*margin:0 5px;*/ } .checkbox-custom{ - margin-bottom:0; - margin-top:0; + margin-bottom:0; } diff --git a/admin/appmarket/template/upgrade.htm b/admin/appmarket/template/upgrade.htm index e7d7e37..3aafa18 100644 --- a/admin/appmarket/template/upgrade.htm +++ b/admin/appmarket/template/upgrade.htm @@ -118,11 +118,11 @@
-
- - -
-
+
+ + +
+
{lang total}$count{lang ge}{lang app} diff --git a/admin/setting/language/en-US/lang.php b/admin/setting/language/en-US/lang.php index 0d50d74..ffbd67a 100644 --- a/admin/setting/language/en-US/lang.php +++ b/admin/setting/language/en-US/lang.php @@ -30,6 +30,7 @@ $lang = array 'Forbidden time'=>'Forbidden time', 'How many login failures are allowed before you can log in again'=>'How many login failures are allowed before you can log in again', 'sec'=>'sec', + 'Visitor login display'=>'Visitor login display', 'If the mail server is not configured, do not enable it. Otherwise, the system stalls'=>'If the mail server is not configured, do not enable it. Otherwise, the system stalls', 'Notification Whether to notify by email'=>'Notification Whether to notify by email', 'Independent login page login template; Parameters will be synchronized to login (including administrator login), registration, password retrieval, and home application.'=>'Independent login page login template; Parameters will be synchronized to login (including administrator login), registration, password retrieval, and home application.', diff --git a/admin/setting/language/zh-cn/lang.php b/admin/setting/language/zh-cn/lang.php index 6b8bc19..680d196 100644 --- a/admin/setting/language/zh-cn/lang.php +++ b/admin/setting/language/zh-cn/lang.php @@ -30,6 +30,7 @@ $lang = array 'Forbidden time'=>'禁止时间', 'How many login failures are allowed before you can log in again'=>'允许登录失败多少后才可再次登录', 'sec'=>'秒', + 'Visitor login display'=>'游客登录', 'If the mail server is not configured, do not enable it. Otherwise, the system stalls'=>'sec', 'Notification Whether to notify by email'=>'如果未配置邮件服务器，请不要启用，以免造成系统卡顿。', 'Independent login page login template; Parameters will be synchronized to login (including administrator login), registration, password retrieval, and home application.'=>'独立登录页登录模板;参数会同步到登录(含管理员登录)、注册、找回密码、首页应用。', diff --git a/admin/setting/template/main.htm b/admin/setting/template/main.htm index 018ce3d..9af05f0 100644 --- a/admin/setting/template/main.htm +++ b/admin/setting/template/main.htm @@ -514,7 +514,7 @@
{lang for_color_set}设置图片和颜色会同步到首页背景设置
-
{lang Visitor login option}
+
{lang Visitor login display}
diff --git a/core/class/dzz/dzz_app.php b/core/class/dzz/dzz_app.php index ac264ac..d825003 100644 --- a/core/class/dzz/dzz_app.php +++ b/core/class/dzz/dzz_app.php @@ -588,22 +588,22 @@ class dzz_app extends dzz_base{ } } if($appidxu=C::t('app_market')->fetch_by_identifier(CURMODULE)){ - if(!$this->var['member']['adminid']){ - if($appidxu['available']==0){ + if($this->var['member']['adminid']){ + }elseif($appidxu['available']==0){ showmessage(lang('您无权使用该应用，请联系管理员。')); - }elseif($this->var['member']['uid']){ - $appuid= C::t('user_field')->fetch($this->var['member']['uid']); + }elseif ($appidxu['group']==0){ + }elseif ($appidxu['group']==-1){ + if ($this->var['member']['uid']){ + showmessage(lang('您无权使用该应用，请联系管理员。')); + } + }else{ + $appuid= C::t('user_field')->fetch($this->var['member']['uid']); $appuidz=explode(',',$appuid['applist']); if (in_array($appidxu['appid'],$appuidz)){ }else{ showmessage(lang('您无权使用该应用，请联系管理员。')); } - }elseif ($appidxu['group']==-1){ - if ($this->var['member']['uid']){ - showmessage(lang('您无权使用该应用，请联系管理员。')); - } - } - } + } } if(isset($this->var['setting']['nocacheheaders']) && $this->var['setting']['nocacheheaders']) { @header("Expires: -1"); diff --git a/core/class/perm/perm_check.php b/core/class/perm/perm_check.php index 7e7967a..bd7cb56 100644 --- a/core/class/perm/perm_check.php +++ b/core/class/perm/perm_check.php @@ -20,7 +20,6 @@ class perm_check{ } return $perm; } - function getPerm($fid, $bz='',$i=0){ global $_G; if(isset($_G['gperm'])) return intval($_G['gperm']);//可以通过这个参数直接使用此权限值不去查询权限 diff --git a/core/class/table/table_folder.php b/core/class/table/table_folder.php index 0f5f3a2..09d3966 100644 --- a/core/class/table/table_folder.php +++ b/core/class/table/table_folder.php @@ -519,6 +519,7 @@ class table_folder extends dzz_table $where1 = array(); if (!$this->noperm && $folder['gid'] > 0) { $folder['perm'] = perm_check::getPerm($folder['fid']); + if ($folder['perm'] > 0) { if (perm_binPerm::havePower('read2', $folder['perm'])) { $where1[] = "1"; diff --git a/core/class/table/table_resources_statis.php b/core/class/table/table_resources_statis.php index a417950..edfd93e 100644 --- a/core/class/table/table_resources_statis.php +++ b/core/class/table/table_resources_statis.php @@ -126,7 +126,7 @@ class table_resources_statis extends dzz_table $uid = getglobal('uid'); $data = array(); $param = array($this->_table,$uid); - $wheresql = " where uid = %d and fid = 0 and rid != '' "; + $wheresql = " where uid = $uid and fid = 0 and rid != '' "; $orderby = ' order by edits desc,views desc,editdateline desc,opendateline desc'; $limitsql = ' limit '.$limit; diff --git a/core/core_version.php b/core/core_version.php index 93618fa..62e3c04 100644 --- a/core/core_version.php +++ b/core/core_version.php @@ -14,7 +14,7 @@ if(!defined('CORE_VERSION')) { define('CORE_VERSION', '2.02'); define('CORE_RELEASE', '20180909'); define('CORE_FIXBUG' , '20000000'); - define('CORE_XHVERSION', '1.71'); - define('CORE_XHRELEASE', '20230124'); - define('CORE_XHFIXBUG' , '20230124'); + define('CORE_XHVERSION', '1.72'); + define('CORE_XHRELEASE', '20230131'); + define('CORE_XHFIXBUG' , '20230131'); } \ No newline at end of file diff --git a/dzz/images/extimg/docxf.png b/dzz/images/extimg/docxf.png new file mode 100644 index 0000000000000000000000000000000000000000..ee0d176dd94d83319c1350f4897a649a076f869b GIT binary patch literal 1786 zcmcJQX*iqd8pq#Q(n#vqsTx-5*UzdqEi^@f#JtUbo#;0Kw5kDK~en3Ut`U%%k`70?gNI@qbN4OA_B8sbpi zS1ugK)?X~W*{C`jh76t=8bzE`3bEl*?B2MBN0SfK!FICCJ<|#y^V>q}DM1$}R7*>1 z1ooGI+MoTU_VBxgn#dE@@Aww1SD$&gMQ6*_W@>6YoA+Mo0myJwK;0Y$C}}H@6%NYb z$-Om!co#*hccO z;Y<4M!+tl>#R8vmmA|-!)H|Oc1Z~GR+@a-BGD}m==qUfXk%0B2ME$T6+z@4TbRlZC zBVp?8R^r%{NrtzT=t*{Z74zGaM{)~$C!GFXtvF(Uv#8}+5<~38yFK4*J^*(opRRU} zr<_N#ut_zvJp7FsRkh-4v~szmT%%FHxPmRaD---@I{CgatF-sm{;)&DbnII^w-mdZ z=!jyUiV5o%nj-2RvDYh+N$1hGSXNe0U7|A}BhZ{p-R*(VvWL z0?E-=tZrwK^FMwMTphCI)5}TlKaS6pWU#GTJF@S5 z6WGu4Q6c_z8Ph5=UhYgW84m+4=?8{rJU3Fjj6T*Iv^!>dN?|s{&mC)kV)7J0(s~Xp zf|vfTN_xR}`G385Um>5dHQ{xSemXqB!x4Ay-K6sw!zk@?r^cnz)Sv4swtqc&8HD`l z0Q9=m=>;U)xy2@03ZFwKX;(@ww%UWwwFR1={~ zu6Zbn4S>^}4u^EEjp=Q2-R~}fd-o0XeZUjAK)EcR3JLa}N$zg>iPRPK!QMyFax_ z>+e^3sIDq2S+co8ez$4rZs%SZnqzciS}5%sEj<4FE*Y~leG*WoLdgm!IekbVqzC{V y9yEIiFdJB`;Q6#CQ~6{;|F7f>?QCs1MpvYIny1(zxy}h^$yMe literal 0 HcmV?d00001 diff --git a/dzz/images/newfile/new.docxf b/dzz/images/newfile/new.docxf new file mode 100644 index 0000000000000000000000000000000000000000..fb04a48d03cc79b46d38736bc7a9f44585ea20a3 GIT binary patch literal 6957 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 D9pHte literal 0 HcmV?d00001 diff --git a/static/css/app_manage.css b/static/css/app_manage.css index 90dde3d..4aafc9c 100644 --- a/static/css/app_manage.css +++ b/static/css/app_manage.css @@ -84,6 +84,7 @@ display: -ms-flexbox; display: -webkit-flex; display: flex; + align-items: center; } .resNav .resNav-left{ diff --git a/static/css/quanju.css b/static/css/quanju.css index 64ac3d3..66a6cd1 100644 --- a/static/css/quanju.css +++ b/static/css/quanju.css @@ -2,11 +2,15 @@ /*滚动条美化*/ /*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/ ::-webkit-scrollbar +{ + width:6px; + height: 5px; +} +::-webkit-scrollbar:hover { width:10px; height: 5px; } - /*定义滚动条轨道 内阴影+圆角*/ ::-webkit-scrollbar-track {