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 0000000..ee0d176 Binary files /dev/null and b/dzz/images/extimg/docxf.png differ diff --git a/dzz/images/newfile/new.docxf b/dzz/images/newfile/new.docxf new file mode 100644 index 0000000..fb04a48 Binary files /dev/null and b/dzz/images/newfile/new.docxf differ 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 {