更新至V1.82.1，更新内容在笔记中查看

2026-03-01 16:42:43 +08:00 · 2023-06-29 11:31:01 +08:00
parent 633f3bb0e7
commit 3a721f1cb0
8 changed files with 90 additions and 65 deletions
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ### 官方网站:http://dzzoffice.com
 ### 小胡版插件获取地址：https://gitee.com/xh2002/projects
-### Dzzoffice笔记：https://thoughts.teambition.com/sharespace/64546633db084500410d69c7
+### 【金山文档】 Dzzoffice笔记：https://p.kdocs.cn/s/VBM22BAAB4
 ### DzzOffice 介绍：

 DzzOffice是一款云存储与应用管理工具,可用于个人、团队网盘和企业OA等。它部署简单,支持多种云存储的接入,并具有强大的文件共享功能以及丰富的成员权限管理。通过将存储文件与云端各类应用的交互,来实现在线协同办公,提高工作效率。
--- 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.82');
-	define('CORE_XHRELEASE', '20230622');
+	define('CORE_XHVERSION', '1.82.1');
+	define('CORE_XHRELEASE', '20230629');
 	define('CORE_XHFIXBUG' , '20230622');
 }
--- a/dzz/images/extimg/docx.png
+++ b/dzz/images/extimg/docx.png
--- a/dzz/shares/images/mobile/password.css
+++ b/dzz/shares/images/mobile/password.css
@@ -103,9 +103,8 @@ ul,ul li{
 .weui-address-container {
    margin-left: 0.5rem;
    overflow: hidden;
-    line-height: 1.7rem;
    position: relative;
-    height: 2rem;
+    height: 1.5rem;
 }
 .weui-address-field {
    position: absolute;
--- a/dzz/shares/template/list.htm
+++ b/dzz/shares/template/list.htm
@@ -162,7 +162,7 @@
                                    <!--{/if}-->
                                </div>
                                <!-- 其他列 -->
-                                <div class="col size" style="width: 12%" data-size="$value[size]">$value[fsize]</div>
+                                <div class="col size" style="width: 12%" data-size="$value[size]"><!--{if $value[type]=='folder' }--><!--{else}-->$value[fsize]<!--{/if}--></div>
                                <div class="col type" style="width:15%" data-type="$value[ftype]">$value[ftype]</div>
                                <div class="col dateline" style="width: 20%" data-dateline="$value[dateline]">
                                    $value[fdateline]
--- a/dzz/shares/template/list_item.htm
+++ b/dzz/shares/template/list_item.htm
@@ -17,7 +17,7 @@
 			<!--{/if}-->
 		</div>
 		<!-- 其他列 -->
-		<div class="col size" style="width: 12%" data-size="$value[size]">$value[fsize]</div>
+		<div class="col size" style="width: 12%" data-size="$value[size]"><!--{if $value[type]=='folder' }--><!--{else}-->$value[fsize]<!--{/if}--></div>
 		<div class="col type" style="width:15%" data-type="$value[ftype]">$value[ftype]</div>
 		<div class="col dateline" style="width: 20%" data-dateline="$value[dateline]">$value[fdateline]</div>
 	</div>
--- a/static/css/checkbox.css
+++ b/static/css/checkbox.css
@@ -128,12 +128,6 @@
    -o-transform: scale(1,1);
    transform: scale(1,1);
 }
-
-.checkbox-custom input[type=radio]:focus+label::before, .checkbox-custom input[type=checkbox]:focus+label::before {
-    outline: thin dotted;
-    outline: 0.36em auto -webkit-focus-ring-color;
-    outline-offset: -2px;
-}
 .checkbox-primary input[type=radio]:checked+label::before, .checkbox-primary input[type=checkbox]:checked+label::before {
    background-color: #4C89FB;
    border-color: #4C89FB;
--- a/user/sso/xhlogin.php
+++ b/user/sso/xhlogin.php
@@ -1,28 +1,53 @@
 <?php
+if($_G['setting']['bbclosed']) showmessage(lang('site_closed_please_admin'));//判断站点是否关闭
 if($_G['setting']['quick_login']){
 	$time=trim($_GET['time']);
 	$username = trim($_GET['username']);
  $email= trim($_GET['email']);
 	$token= trim($_GET['token']);
 	if($email && $username && $token && $time){
-    if ($time < (time() - 5)) showmessage('验证时间已过期，请重新获取');
+    if ($time < (time() - 5)) {//验证时间已过期时
+			//写入日志
+      writelog('loginlog', '尝试XH通用登录失败，验证时间已过期');
+			showmessage('验证时间已过期，请重新获取');
+      return;
+    }
    $key=$_G['setting']['quick_key'];
    $md5=md5(''.$username.''.''.$email.''.''.$key.''.''.$time.'');
 		if (!($token ===  $md5)) {
+			//写入日志
+      writelog('loginlog', '尝试XH通用登录失败,XH通用登录KAY不正确');
 			showmessage('XH通用登录KAY不正确');
      return;
    }
    if(($user=C::t('user')->fetch_by_username($username)) || ($user=C::t('user')->fetch_by_email($email))){//用户已经存在时
-    if ($user['adminid']) showmessage('为了安全，禁止管理员通过这种方式登录');
-      $idstring = explode('_', $user['emailsenddate']);
-    if ($idstring[0] == (time() - $idstring[1]) < 86400) {
-        dsetcookie('auth', authcode("{$user['password']}\t{$user['uid']}", 'ENCODE'), 0, 1, true);
+			if ($user['adminid']) {
+        //写入日志
+        writelog('loginlog', '管理员尝试XH通用登录失败');
+        showmessage('为了安全，禁止管理员通过这种方式登录');
+        return;
      }
+			$result = getuserbyuid($user['uid'], 1);
+			if($result['status']>0){
+				//写入日志
+				writelog('loginlog', '尝试XH通用登录失败,此用户已停用');
+        showmessage('此用户已停用，请联系管理员');
+      }
+      //设置登录
+      setloginstatus($result, $_GET['cookietime'] ? 2592000 : 0);
+
+      if($_G['member']['lastip'] && $_G['member']['lastvisit']) {
+
+          dsetcookie('lip', $_G['member']['lastip'].','.$_G['member']['lastvisit']);
+      }
+
+      //记录登录
+      C::t('user_status')->update($_G['uid'], array('lastip' => $_G['clientip'], 'lastvisit' =>TIMESTAMP, 'lastactivity' => TIMESTAMP));
+      writelog('loginlog', 'XH通用登录成功');
      showmessage('Login_success',$_G['siteurl']);
-}else{
-if($_G['setting']['bbclosed']) showmessage(lang('site_closed_please_admin'));//判断站点是否关闭
-require_once libfile('function/user','','user');
-if(!check_username($username)) showmessage(lang('user_name_sensitive'));
+    }else{
+      require_once libfile('function/user','','user');
+      if(!check_username($username)) showmessage(lang('user_name_sensitive'));
        $password=$_G['setting']['quick_password'];
        $user=uc_add_user($username, $password, $email);
        $uid=$user['uid'];
@@ -51,16 +76,23 @@ if(!check_username($username)) showmessage(lang('user_name_sensitive'));
        $sitename=$_G['setting']['sitename'];
        C::t('user')->update($uid,$base);

-    $idstring = explode('_', $user['emailsenddate']);
+      //设置登录
+			$result = getuserbyuid($user['uid'], 1);
+      setloginstatus($result, $_GET['cookietime'] ? 2592000 : 0);

-    if ($idstring[0] == (time() - $idstring[1]) < 86400) {
-
-        dsetcookie('auth', authcode("{$user['password']}\t{$user['uid']}", 'ENCODE'), 0, 1, true);
+      if($_G['member']['lastip'] && $_G['member']['lastvisit']) {

+          dsetcookie('lip', $_G['member']['lastip'].','.$_G['member']['lastvisit']);
      }
+
+      //记录登录
+      C::t('user_status')->update($_G['uid'], array('lastip' => $_G['clientip'], 'lastvisit' =>TIMESTAMP, 'lastactivity' => TIMESTAMP));
+        writelog('loginlog', 'XH通用登录成功');
        showmessage('Login_success',$_G['siteurl']);
      }
-}
-}else{
+    }
+  }else{
+	//写入日志
+  writelog('loginlog', '尝试XH通用登录失败，未开启XH通用登录');
  showmessage('未开启XH通用登录');
 }