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

2026-01-15 12:06:49 +08:00 · 2023-09-22 11:56:51 +08:00
parent e417b11656
commit 5218c916cd
21 changed files with 187 additions and 1032 deletions
--- 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.86');
+	define('CORE_XHVERSION', '1.86.1');
 	define('CORE_XHRELEASE', '20230909');
-	define('CORE_XHFIXBUG' , '20230909');
+	define('CORE_XHFIXBUG' , '20230922');
 }
--- a/core/template/default/common/adminlogin.htm
+++ b/core/template/default/common/adminlogin.htm
@@ -92,7 +92,7 @@
  </div>
 </div>
 <!--{elseif $_G['setting'][loginset][template] == 3}-->
-<body class="center-vh">
+<div class="center-vh">
 	<div class="card<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
    <div class="flex-box login-box">

@@ -124,8 +124,9 @@
        </div>
      </div>
  </div>
+</div>
 <!--{else}-->
-<body class="center-vh">
+<div class="center-vh">
  <div class="card card-shadowed p-5 mb-0 mr-2 ml-2<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->" id="register_form">
    <div class="text-center mb-3">
      $avastar
@@ -145,6 +146,7 @@
    </form>    
    <p class="text-center mb-0"><!--{template common/copyright}--></p>
  </div>
+</div>
 <!--{/if}-->
 <script type="text/JavaScript">
 jQuery(document).ready(function(e) {
--- a/dzz/DPlayer/dzz_app_DPlayer.xml
+++ b/dzz/DPlayer/dzz_app_DPlayer.xml
@@ -26,9 +26,7 @@
 			<item id="nodup"><![CDATA[0]]></item>
 			<item id="identifier"><![CDATA[DPlayer]]></item>
 			<item id="app_path"><![CDATA[dzz]]></item>
-			<item id="version"><![CDATA[1.2]]></item>
-			<item id="extra"><![CDATA[
-			]]></item>
+			<item id="version"><![CDATA[1.29.1]]></item>
 			<item id="mid"><![CDATA[0]]></item>
 		</item>
 		<item id="version"><![CDATA[2.0]]></item>
--- a/dzz/config/config-sample.php
+++ b/dzz/config/config-sample.php
@@ -4,7 +4,7 @@ return array(
    'allow_view'=>1,
    'allow_robot'=>false,//是否允许机器人爬取
    /*此三项配置如果未配置，将读取系统默认配置访问*/
-    'default_mod'=>'index_simple',//默认应用CONFIG DEFAULT_MOD
+    'default_mod'=>'index',//默认应用CONFIG DEFAULT_MOD
    'default_op' => 'index',//CONFIG DEFAULT_OP
    'dafault_action' => 'index',//CONFIG DAFAULT_ACTION
    /*加载函数文件，有两种格式：
--- a/install/data/install_data.sql
+++ b/install/data/install_data.sql
@@ -185,7 +185,6 @@ INSERT INTO `dzz_setting` VALUES('timeoffset', '8');
 INSERT INTO `dzz_setting` VALUES('reginput', 'a:4:{s:8:"username";s:8:"username";s:8:"password";s:8:"password";s:9:"password2";s:9:"password2";s:5:"email";s:5:"email";}');
 INSERT INTO `dzz_setting` VALUES('newusergroupid', '9');
 INSERT INTO `dzz_setting` VALUES('dateformat', 'Y-n-j');
-INSERT INTO `dzz_setting` VALUES('default_mod', 'index_simple');
 INSERT INTO `dzz_setting` VALUES('forbiddentime', '900');
 INSERT INTO `dzz_setting` VALUES('numberoflogins', '5');
 INSERT INTO `dzz_setting` VALUES('notification', '60');
--- a/install/update.php
+++ b/install/update.php
@@ -6,7 +6,7 @@
 * @link        http://www.dzzoffice.com
 * @author      zyx(zyx@dzz.cc)
 */
-require '../core/coreBase.php';
+require './core/coreBase.php';
@set_time_limit(0);
 $cachelist = array();
 $dzz = C::app();
@@ -265,7 +265,7 @@ if($_GET['step'] == 'start') {
 		 C::t('setting')->update('fileVersionNumber', '50');
 		}
 		if(!DB::result_first("select COUNT(*) from %t where skey=%s",array('setting','default_mod'))){
-     C::t('setting')->update('default_mod', 'index_simple');
+     C::t('setting')->update('default_mod', 'index');
 		}
 		if(!DB::result_first("select COUNT(*) from %t where skey=%s",array('setting','forbiddentime'))){
 		 C::t('setting')->update('forbiddentime', '900');
@@ -897,5 +897,4 @@ function create_table($sql, $dbcharset) {
 	return preg_replace("/^\s*(CREATE TABLE\s+.+\s+\(.+?\)).*$/isU", "\\1", $sql).
 	(" ENGINE=$type DEFAULT CHARSET=".$dbcharset);
 }
-
 ?>
--- a/static/bootstrap/css/bootstrap.min.css
+++ b/static/bootstrap/css/bootstrap.min.css
@@ -9984,7 +9984,7 @@ fieldset:disabled .btn {
    background-clip: padding-box;
    border: 1px solid rgba(0, 0, 0, .1);
    box-shadow: 0 .5rem 1rem rgba(0, 0, 0, .15);
-    border-radius: .25rem
+    border-radius: var(--radius);
 }

 .toast.showing {
@@ -10001,7 +10001,7 @@ fieldset:disabled .btn {
    width: max-content;
    max-width: 100%;
    pointer-events: none;
-    z-index: 5;
+    z-index: 2111;
 }

 .toast-container>:not(:last-child) {
--- a/static/css/barber-shop.css
+++ b/static/css/barber-shop.css
@@ -1,16 +1,14 @@
 .pace {
 	-webkit-pointer-events: none;
 	pointer-events: none;
-
 	-webkit-user-select: none;
 	-moz-user-select: none;
 	user-select: none;
-
 	overflow: hidden;
 	position: fixed;
 	top: 0;
 	left: 0;
-	z-index: 2000;
+	z-index: 2200;
 	width: 100%;
 	height: 5px;
 }
@@ -21,64 +19,175 @@

 .pace .pace-progress {
 	background: var(--bs-primary);
-	background-color: var(--bs-primary);
 	position: fixed;
+	z-index: 2000;
 	top: 0;
-	bottom: 0;
 	right: 100%;
 	width: 100%;
-	overflow: hidden;
 	height: 5px;
 }
+.pace .pace-progress:after {
+	content: attr(data-progress-text);
+	display: inline-block;
+	position: fixed;
+	text-align: right;
+	top: 4px;
+	left: 0;
+	width: 100%;
+}
+.pace .pace-progress[data-progress-text="0%"]:after { right: -200px }
+.pace .pace-progress[data-progress-text="1%"]:after { right: -198.14px }
+.pace .pace-progress[data-progress-text="2%"]:after { right: -196.28px }
+.pace .pace-progress[data-progress-text="3%"]:after { right: -194.42px }
+.pace .pace-progress[data-progress-text="4%"]:after { right: -192.56px }
+.pace .pace-progress[data-progress-text="5%"]:after { right: -190.7px }
+.pace .pace-progress[data-progress-text="6%"]:after { right: -188.84px }
+.pace .pace-progress[data-progress-text="7%"]:after { right: -186.98px }
+.pace .pace-progress[data-progress-text="8%"]:after { right: -185.12px }
+.pace .pace-progress[data-progress-text="9%"]:after { right: -183.26px }
+.pace .pace-progress[data-progress-text="10%"]:after { right: -181.4px }
+.pace .pace-progress[data-progress-text="11%"]:after { right: -179.54px }
+.pace .pace-progress[data-progress-text="12%"]:after { right: -177.68px }
+.pace .pace-progress[data-progress-text="13%"]:after { right: -175.82px }
+.pace .pace-progress[data-progress-text="14%"]:after { right: -173.96px }
+.pace .pace-progress[data-progress-text="15%"]:after { right: -172.1px }
+.pace .pace-progress[data-progress-text="16%"]:after { right: -170.24px }
+.pace .pace-progress[data-progress-text="17%"]:after { right: -168.38px }
+.pace .pace-progress[data-progress-text="18%"]:after { right: -166.52px }
+.pace .pace-progress[data-progress-text="19%"]:after { right: -164.66px }
+.pace .pace-progress[data-progress-text="20%"]:after { right: -162.8px }
+.pace .pace-progress[data-progress-text="21%"]:after { right: -160.94px }
+.pace .pace-progress[data-progress-text="22%"]:after { right: -159.08px }
+.pace .pace-progress[data-progress-text="23%"]:after { right: -157.22px }
+.pace .pace-progress[data-progress-text="24%"]:after { right: -155.36px }
+.pace .pace-progress[data-progress-text="25%"]:after { right: -153.5px }
+.pace .pace-progress[data-progress-text="26%"]:after { right: -151.64px }
+.pace .pace-progress[data-progress-text="27%"]:after { right: -149.78px }
+.pace .pace-progress[data-progress-text="28%"]:after { right: -147.92px }
+.pace .pace-progress[data-progress-text="29%"]:after { right: -146.06px }
+.pace .pace-progress[data-progress-text="30%"]:after { right: -144.2px }
+.pace .pace-progress[data-progress-text="31%"]:after { right: -142.34px }
+.pace .pace-progress[data-progress-text="32%"]:after { right: -140.48px }
+.pace .pace-progress[data-progress-text="33%"]:after { right: -138.62px }
+.pace .pace-progress[data-progress-text="34%"]:after { right: -136.76px }
+.pace .pace-progress[data-progress-text="35%"]:after { right: -134.9px }
+.pace .pace-progress[data-progress-text="36%"]:after { right: -133.04px }
+.pace .pace-progress[data-progress-text="37%"]:after { right: -131.18px }
+.pace .pace-progress[data-progress-text="38%"]:after { right: -129.32px }
+.pace .pace-progress[data-progress-text="39%"]:after { right: -127.46px }
+.pace .pace-progress[data-progress-text="40%"]:after { right: -125.6px }
+.pace .pace-progress[data-progress-text="41%"]:after { right: -123.74px }
+.pace .pace-progress[data-progress-text="42%"]:after { right: -121.88px }
+.pace .pace-progress[data-progress-text="43%"]:after { right: -120.02px }
+.pace .pace-progress[data-progress-text="44%"]:after { right: -118.16px }
+.pace .pace-progress[data-progress-text="45%"]:after { right: -116.3px }
+.pace .pace-progress[data-progress-text="46%"]:after { right: -114.44px }
+.pace .pace-progress[data-progress-text="47%"]:after { right: -112.58px }
+.pace .pace-progress[data-progress-text="48%"]:after { right: -110.72px }
+.pace .pace-progress[data-progress-text="49%"]:after { right: -108.86px }
+.pace .pace-progress[data-progress-text="50%"]:after { right: -107px }
+.pace .pace-progress[data-progress-text="51%"]:after { right: -105.14px }
+.pace .pace-progress[data-progress-text="52%"]:after { right: -103.28px }
+.pace .pace-progress[data-progress-text="53%"]:after { right: -101.42px }
+.pace .pace-progress[data-progress-text="54%"]:after { right: -99.56px }
+.pace .pace-progress[data-progress-text="55%"]:after { right: -97.7px }
+.pace .pace-progress[data-progress-text="56%"]:after { right: -95.84px }
+.pace .pace-progress[data-progress-text="57%"]:after { right: -93.98px }
+.pace .pace-progress[data-progress-text="58%"]:after { right: -92.12px }
+.pace .pace-progress[data-progress-text="59%"]:after { right: -90.26px }
+.pace .pace-progress[data-progress-text="60%"]:after { right: -88.4px }
+.pace .pace-progress[data-progress-text="61%"]:after { right: -86.53999999999999px }
+.pace .pace-progress[data-progress-text="62%"]:after { right: -84.68px }
+.pace .pace-progress[data-progress-text="63%"]:after { right: -82.82px }
+.pace .pace-progress[data-progress-text="64%"]:after { right: -80.96000000000001px }
+.pace .pace-progress[data-progress-text="65%"]:after { right: -79.1px }
+.pace .pace-progress[data-progress-text="66%"]:after { right: -77.24px }
+.pace .pace-progress[data-progress-text="67%"]:after { right: -75.38px }
+.pace .pace-progress[data-progress-text="68%"]:after { right: -73.52px }
+.pace .pace-progress[data-progress-text="69%"]:after { right: -71.66px }
+.pace .pace-progress[data-progress-text="70%"]:after { right: -69.8px }
+.pace .pace-progress[data-progress-text="71%"]:after { right: -67.94px }
+.pace .pace-progress[data-progress-text="72%"]:after { right: -66.08px }
+.pace .pace-progress[data-progress-text="73%"]:after { right: -64.22px }
+.pace .pace-progress[data-progress-text="74%"]:after { right: -62.36px }
+.pace .pace-progress[data-progress-text="75%"]:after { right: -60.5px }
+.pace .pace-progress[data-progress-text="76%"]:after { right: -58.64px }
+.pace .pace-progress[data-progress-text="77%"]:after { right: -56.78px }
+.pace .pace-progress[data-progress-text="78%"]:after { right: -54.92px }
+.pace .pace-progress[data-progress-text="79%"]:after { right: -53.06px }
+.pace .pace-progress[data-progress-text="80%"]:after { right: -51.2px }
+.pace .pace-progress[data-progress-text="81%"]:after { right: -49.34px }
+.pace .pace-progress[data-progress-text="82%"]:after { right: -47.480000000000004px }
+.pace .pace-progress[data-progress-text="83%"]:after { right: -45.62px }
+.pace .pace-progress[data-progress-text="84%"]:after { right: -43.76px }
+.pace .pace-progress[data-progress-text="85%"]:after { right: -41.9px }
+.pace .pace-progress[data-progress-text="86%"]:after { right: -40.04px }
+.pace .pace-progress[data-progress-text="87%"]:after { right: -38.18px }
+.pace .pace-progress[data-progress-text="88%"]:after { right: -36.32px }
+.pace .pace-progress[data-progress-text="89%"]:after { right: -34.46px }
+.pace .pace-progress[data-progress-text="90%"]:after { right: -32.6px }
+.pace .pace-progress[data-progress-text="91%"]:after { right: -30.740000000000002px }
+.pace .pace-progress[data-progress-text="92%"]:after { right: -28.880000000000003px }
+.pace .pace-progress[data-progress-text="93%"]:after { right: -27.02px }
+.pace .pace-progress[data-progress-text="94%"]:after { right: -25.16px }
+.pace .pace-progress[data-progress-text="95%"]:after { right: -23.3px }
+.pace .pace-progress[data-progress-text="96%"]:after { right: -21.439999999999998px }
+.pace .pace-progress[data-progress-text="97%"]:after { right: -19.58px }
+.pace .pace-progress[data-progress-text="98%"]:after { right: -17.72px }
+.pace .pace-progress[data-progress-text="99%"]:after { right: -15.86px }
+.pace .pace-progress[data-progress-text="100%"]:after { right: -14px }
+
+.pace .pace-progress-inner {
+	display: block;
+	position: absolute;
+	right: 0px;
+	width: 100px;
+	height: 100%;
+	box-shadow: 0 0 10px var(--bs-primary), 0 0 5px var(--bs-primary);
+	opacity: 1.0;
+	-webkit-transform: rotate(3deg) translate(0px, -4px);
+	-moz-transform: rotate(3deg) translate(0px, -4px);
+	-ms-transform: rotate(3deg) translate(0px, -4px);
+	-o-transform: rotate(3deg) translate(0px, -4px);
+	transform: rotate(3deg) translate(0px, -4px);
+}

 .pace .pace-activity {
+	display: block;
 	position: fixed;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	height: 5px;
-
-	-webkit-transform: translate3d(0, 0, 0);
-	-moz-transform: translate3d(0, 0, 0);
-	-ms-transform: translate3d(0, 0, 0);
-	-o-transform: translate3d(0, 0, 0);
-	transform: translate3d(0, 0, 0);
-
-	background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.2)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.2)), color-stop(0.75, rgba(255, 255, 255, 0.2)), color-stop(0.75, transparent), to(transparent));
-	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-	background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-	background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-	background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
-	-webkit-background-size: 32px 32px;
-	-moz-background-size: 32px 32px;
-	-o-background-size: 32px 32px;
-	background-size: 32px 32px;
-
-	-webkit-animation: pace-theme-barber-shop-motion 500ms linear infinite;
-	-moz-animation: pace-theme-barber-shop-motion 500ms linear infinite;
-	-ms-animation: pace-theme-barber-shop-motion 500ms linear infinite;
-	-o-animation: pace-theme-barber-shop-motion 500ms linear infinite;
-	animation: pace-theme-barber-shop-motion 500ms linear infinite;
+	z-index: 2200;
+	top: 25px;
+	right: 15px;
+	width: 14px;
+	height: 14px;
+	border: solid 2px transparent;
+	border-top-color: #29d;
+	border-left-color: #29d;
+	border-radius: 10px;
+	-webkit-animation: pace-spinner 400ms linear infinite;
+	-moz-animation: pace-spinner 400ms linear infinite;
+	-ms-animation: pace-spinner 400ms linear infinite;
+	-o-animation: pace-spinner 400ms linear infinite;
+	animation: pace-spinner 400ms linear infinite;
 }

-@-webkit-keyframes pace-theme-barber-shop-motion {
-	0% { -webkit-transform: none; transform: none; }
-	100% { -webkit-transform: translate(-32px, 0); transform: translate(-32px, 0); }
+@-webkit-keyframes pace-spinner {
+	0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); }
+	100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); }
 }
-@-moz-keyframes pace-theme-barber-shop-motion {
-	0% { -moz-transform: none; transform: none; }
-	100% { -moz-transform: translate(-32px, 0); transform: translate(-32px, 0); }
+@-moz-keyframes pace-spinner {
+	0% { -moz-transform: rotate(0deg); transform: rotate(0deg); }
+	100% { -moz-transform: rotate(360deg); transform: rotate(360deg); }
 }
-@-o-keyframes pace-theme-barber-shop-motion {
-	0% { -o-transform: none; transform: none; }
-	100% { -o-transform: translate(-32px, 0); transform: translate(-32px, 0); }
+@-o-keyframes pace-spinner {
+	0% { -o-transform: rotate(0deg); transform: rotate(0deg); }
+	100% { -o-transform: rotate(360deg); transform: rotate(360deg); }
 }
-@-ms-keyframes pace-theme-barber-shop-motion {
-	0% { -ms-transform: none; transform: none; }
-	100% { -ms-transform: translate(-32px, 0); transform: translate(-32px, 0); }
+@-ms-keyframes pace-spinner {
+	0% { -ms-transform: rotate(0deg); transform: rotate(0deg); }
+	100% { -ms-transform: rotate(360deg); transform: rotate(360deg); }
 }
-@keyframes pace-theme-barber-shop-motion {
-	0% { transform: none; transform: none; }
-	100% { transform: translate(-32px, 0); transform: translate(-32px, 0); }
+@keyframes pace-spinner {
+	0% { transform: rotate(0deg); transform: rotate(0deg); }
+	100% { transform: rotate(360deg); transform: rotate(360deg); }
 }
--- a/static/css/style.min.css
+++ b/static/css/style.min.css
@@ -2611,7 +2611,6 @@ hr.dropdown-divider {
 /* toast */
 .toast {
 	box-shadow: 0 0.125rem 0.75rem rgba(var(--bs-dark-rgb), .0375);
-	border-radius: 0.25rem;
 }

 .toast-header i {
--- a/static/js/pace.min.js
+++ b/static/js/pace.min.js
--- a/user/login/template/getpasswd.htm
+++ b/user/login/template/getpasswd.htm
@@ -42,7 +42,7 @@
 </style>
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
-<body class="center-vh">
+<div class="center-vh">
 <div class="card card-shadowed p-5 mb-0 mr-2 ml-2<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
  <div class="text-center mb-3">
 		<img alt="light year admin" src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png';}" style="max-height: 60px;">
@@ -69,6 +69,7 @@
  </form>    
  <p class="text-center mb-0"><!--{template common/copyright}--></p>
 </div>
+</div>
 <!--{if $_G['setting']['pwdsafety']}--> 
 <script type="text/javascript" src="user/scripts/md5.js?{VERHASH}" reload="1"></script> 
 <!--{/if}--> 
--- a/user/login/template/getpasswd3.htm
+++ b/user/login/template/getpasswd3.htm
@@ -24,7 +24,7 @@
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
 <!--{if !empty($_GET['inajax'])}--><button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">×</button><!--{/if}-->
-<body class="center-vh">
+<div class="center-vh">
 	<div class="card<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
 <div class="flex-box login-box">
  <div class="login-left p-5">
@@ -65,6 +65,7 @@
      <!--{if $_G[setting][metadescription]}--><p class="text-white align-self-end">$_G[setting][metadescription]</p><!--{/if}-->
    </div>
 </div>
+</div>
 <script type="text/javascript" src="user/scripts/register.js?{VERHASH}"></script>
 <script type="text/javascript">
 	function validate(form) {
--- a/user/login/template/login_single1.htm
+++ b/user/login/template/login_single1.htm
@@ -42,7 +42,7 @@
 </style>
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
-<body class="center-vh">
+<div class="center-vh">
 <div class="card card-shadowed p-5 mb-0 mr-2 ml-2<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
  <div class="text-center mb-3">
  	<img alt="light year admin" src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png';}">
@@ -97,6 +97,7 @@
  </form>
  <p class="text-center mb-0"><!--{template common/copyright}--></p>
 </div>
+</div>
 <!--{if $_G['setting']['pwdsafety']}--> 
 <script type="text/javascript" src="user/scripts/md5.js?{VERHASH}" reload="1"></script> 
 <!--{/if}--> 
--- a/user/login/template/login_single3.htm
+++ b/user/login/template/login_single3.htm
@@ -53,7 +53,7 @@
 <![endif]-->
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
-<body class="center-vh">
+<<div class="center-vh">
 	<div class="card<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
    <div class="flex-box login-box">
      <div class="login-left p-5">
@@ -115,6 +115,7 @@
      </div>
    </div>
  </div>
+</div>
 <!--{if $_G['setting']['pwdsafety']}--> 
 <script type="text/javascript" src="user/scripts/md5.js?{VERHASH}" reload="1"></script> 
 <!--{/if}--> 
--- a/user/login/template/lostpasswd.htm
+++ b/user/login/template/lostpasswd.htm
@@ -22,7 +22,7 @@
 	<!--{/if}-->
 </style>
 <!--{template common/beijing}-->
-<body class="center-vh">
+<div class="center-vh">
 <div class="card card-shadowed p-5 mb-0 mr-2 ml-2<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->" id="lostpw_container_$loginhash" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
  <div class="text-center mb-3">
 		<img alt="light year admin" src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png';}" style="max-height: 60px;">
@@ -56,6 +56,7 @@
  </div>
  <p class="text-center mb-0"><!--{template common/copyright}--></p>
 </div>
+</div>
 <script type="text/javascript">
  jQuery(document).ready(function(e) {
    jQuery('#lostpw_email').focus();
--- a/user/login/template/lostpasswd3.htm
+++ b/user/login/template/lostpasswd3.htm
@@ -55,7 +55,7 @@
 <script type="text/javascript" src="user/scripts/login.js?{VERHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
 <!--{if !empty($_GET['inajax'])}--><button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">×</button><!--{/if}-->
-<body class="center-vh">
+<div class="center-vh">
 	<div class="card<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
    <div class="flex-box login-box" id="lostpw_container_$loginhash">
        <div class="login-left p-5">
@@ -101,6 +101,7 @@
        </div>
      </div>
 	</div>
+</div>
 <script type="text/javascript">
  jQuery(document).ready(function(e) {
    jQuery('#lostpw_email').focus();
--- a/user/profile/avatar.php
+++ b/user/profile/avatar.php
@@ -19,7 +19,7 @@ if(submitcheck('avatarsubmit')) {
 	if($success) exit(json_encode(array('msg'=>'success')));
 	else exit(json_encode(array('error'=>'头像保存错误，请稍候重试')));

-	showmessage('do_success', '{MOD_URL}&op=avatar');
+	showmessage('do_success', MOD_URL.'&op=avatar');

 }elseif($_GET['do']=='imageupload'){

--- a/user/register/template/register.htm
+++ b/user/register/template/register.htm
@@ -43,7 +43,7 @@
 	}
 	<!--{/if}-->
 </style>
-<body class="center-vh">
+<div class="center-vh">
 <div class="card card-shadowed p-5 mb-0 mr-2 ml-2<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->" id="register_form">
  <div class="text-center mb-3">
 		<img alt="light year admin" src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png';}" style="max-height: 60px;">
@@ -107,6 +107,7 @@
  </form>    
  <p class="text-center mb-0"><!--{template common/copyright}--></p>
 </div>
+</div>
 <script type="text/javascript">
 	var lastusername = '', lastpassword = '', lastemail = '', lastinvitecode = '', stmp = new Array(), modifypwd = false;
 	var ignoreEmail = false;
--- a/user/register/template/register3.htm
+++ b/user/register/template/register3.htm
@@ -53,7 +53,7 @@
 <![endif]-->
 <script src="user/scripts/register.js?{VARHASH}"></script>
 <!--{eval $loginhash = 'L'.random(4);}-->
-<body class="center-vh">
+<div class="center-vh">
 	<div class="card<!--{if $_G[setting][loginset][lwaveanimation]}--> wave wave-animate-slow<!--{/if}-->">
    <div class="flex-box login-box">
        <div class="login-left p-5">
@@ -128,6 +128,7 @@
        </div>
      </div>
  </div>
+</div>
 <script type="text/javascript">
 	var lastusername = '', lastpassword = '', lastemail = '', lastinvitecode = '', stmp = new Array(), modifypwd = false;
 	var ignoreEmail = false;
--- a/user/sso/login.php
+++ b/user/sso/login.php
@@ -1,67 +0,0 @@
-<?php
-$do = $_GET['do'];
-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() - 60)) showmessage('验证时间已过期，请重新获取',$_G['siteurl']);
-    $key=$_G['setting']['quick_key'];
-    $md5=md5(''.$username.''.''.$email.''.''.$key.''.''.$time.'');
-		if (!($token ===  $md5)) {
-            showmessage('token不正确',$_G['siteurl']);
-            return;
-        }
-    if(($user=C::t('user')->fetch_by_username($username)) || ($user=C::t('user')->fetch_by_email($email))){//用户已经存在时
-    if ($user['adminid']) showmessage('为了安全，禁止管理员通过这种方式登录',$_G['siteurl']);
-      $idstring = explode('_', $user['emailsenddate']);
-    if ($idstring[0] == (time() - $idstring[1]) < 86400) {
-        dsetcookie('auth', authcode("{$user['password']}\t{$user['uid']}", 'ENCODE'), 0, 1, true);
-    }
-		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)) exit(json_encode(array('error'=>lang('user_name_sensitive'))));
-		$password=$_G['setting']['quick_password'];
-		$user=uc_add_user($username, $password, $email);
-		$uid=$user['uid'];
-		if($uid<1)  exit(json_encode(array('error'=>lang('import_failure'))));
-		$base = array(
-				'uid' => $uid,
-				'adminid' => 0,
-				'groupid' =>9,
-				'regdate' => TIMESTAMP,
-				'emailstatus' => 1,
-			);
-			if($_GET['mobile']){
-				if(!preg_match("/^\d+$/",$_GET['mobile'])){
-				}elseif(C::t('user')->fetch_by_phone($_GET['mobile']) ) {
-				}else{
-					$base['phone']=$_GET['mobile'];
-				}
-			}
-			if($_GET['weixinid']){
-				if(!preg_match("/^[a-zA-Z\d_]{5,}$/i",$_GET['weixinid'])){
-				}elseif(C::t('user')->fetch_by_weixinid($_GET['weixinid'])) {
-				}else{
-					$base['weixinid']=$_GET['weixinid'];
-				}
-			}
-		$sitename=$_G['setting']['sitename'];
-		C::t('user')->update($uid,$base);
-	
-    $idstring = explode('_', $user['emailsenddate']);
-
-    if ($idstring[0] == (time() - $idstring[1]) < 86400) {
-
-        dsetcookie('auth', authcode("{$user['password']}\t{$user['uid']}", 'ENCODE'), 0, 1, true);
-
-    }
-		showmessage('Login_success',$_G['siteurl']);
-  }
-}
-}else{
-  showmessage('未开启快速登录',$_G['siteurl']);
-}
--- a/user/sso/xhlogin.php
+++ b/user/sso/xhlogin.php
@@ -1,98 +0,0 @@
-<?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)) {//验证时间已过期时
-			//写入日志
-      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']) {
-        //写入日志
-        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{
-      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'];
-        if($uid<1)  showmessage(lang('import_failure'));
-        $base = array(
-          'uid' => $uid,
-          'adminid' => 0,
-          'groupid' =>9,
-          'regdate' => TIMESTAMP,
-          'emailstatus' => 1,
-        );
-        if($_GET['mobile']){
-          if(!preg_match("/^\d+$/",$_GET['mobile'])){
-          }elseif(C::t('user')->fetch_by_phone($_GET['mobile']) ) {
-          }else{
-            $base['phone']=$_GET['mobile'];
-          }
-        }
-        if($_GET['weixinid']){
-          if(!preg_match("/^[a-zA-Z\d_]{5,}$/i",$_GET['weixinid'])){
-          }elseif(C::t('user')->fetch_by_weixinid($_GET['weixinid'])) {
-          }else{
-            $base['weixinid']=$_GET['weixinid'];
-          }
-        }
-        $sitename=$_G['setting']['sitename'];
-        C::t('user')->update($uid,$base);
-
-      //设置登录
-			$result = getuserbyuid($user['uid'], 1);
-      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{
-	//写入日志
-  writelog('loginlog', '尝试XH通用登录失败，未开启XH通用登录');
-  showmessage('未开启XH通用登录');
-}