end

src/admin/js/global.js

@@ -1,6 +1,6 @@
 var BROWSER = {};
 var USERAGENT = navigator.userAgent.toLowerCase();
-browserVersion({'ie':'msie','firefox':'','chrome':'','opera':'','safari':'','maxthon':'','mozilla':'','webkit':''});
+browserVersion({'firefox':'','chrome':'','opera':'','safari':'','maxthon':'','mozilla':'','webkit':''});
 if (BROWSER.safari) {
 	BROWSER.firefox = true;
 }

src/admin/templets/index.htm

@@ -63,20 +63,15 @@
 			<div class="main"><iframe name="main" src="index_body.php"></iframe></div>
 		</div>
 		<script>
-			$(function() {
-				LeftMenuToggle();
+			$("#togglemenu").click(function() {
+				if ($("body").attr("class") === "showmenu") {
+					$("body").attr("class", "hidemenu");
+					$(this).html('<i class="fa fa-indent"></i>');
+				} else {
+					$("body").attr("class", "showmenu");
+					$(this).html('<i class="fa fa-dedent"></i>');
+				}
 			});
-			function LeftMenuToggle() {
-				$("#togglemenu").click(function() {
-					if ($("body").attr("class") == "showmenu") {
-						$("body").attr("class", "hidemenu");
-						$(this).html('<i class="fa fa-indent"></i>');
-					} else {
-						$("body").attr("class", "showmenu");
-						$(this).html('<i class="fa fa-dedent"></i>');
-					}
-				});
-			}
 		</script>
 	</body>
 </html>

src/admin/templets/member_pm.htm

@@ -21,17 +21,16 @@
 							<option value="outbox">发件箱</option>
 						</select>
 						<button type="submit" class="btn btn-success btn-sm">搜索</button>
+						<span id="cate_1" class="btn btn-success btn-sm">短信列表</span>
+						<a href="member_pmall.php" class="btn btn-outline-success btn-sm">群发短信</a>
+						<a href="member_pmone.php" class="btn btn-outline-success btn-sm">单独短信</a>
 					</td>
 				</tr>
 			</table>
 		</form>
 		<table align="center" class="table maintable mb-3">
 			<tr>
-				<td bgcolor="#f5f5f5" colspan="7">
-					<span id="cate_1" class="btn btn-success btn-sm">短信列表</span>
-					<a href="member_pmall.php" class="btn btn-outline-success btn-sm">群发短信</a>
-					<a href="member_pmone.php" class="btn btn-outline-success btn-sm">单独短信</a>
-				</td>
+				<td bgcolor="#f5f5f5" colspan="7">短信列表</td>
 			</tr>
 			<tr bgcolor="#e9ecef">
 				<td width="10%" align="center">发送时间</td>

src/admin/templets/member_pmall.htm

@@ -20,6 +20,9 @@
 							<option value="outbox">发件箱</option>
 						</select>
 						<button type="submit" class="btn btn-success btn-sm">搜索</button>
+						<a href="member_pm.php" class="btn btn-outline-success btn-sm">短信列表</a>
+						<span id="cate_1" class="btn btn-success btn-sm">群发短信</span>
+						<a href="member_pmone.php" class="btn btn-outline-success btn-sm">单独短信</a>
 					</td>
 				</tr>
 			</table>
@@ -28,19 +31,15 @@
 			<input type="hidden" name="action" value="post">
 			<table align="center" class="table maintable mb-3">
 				<tr>
-					<td bgcolor="#f5f5f5" colspan="2">
-						<a href="member_pm.php" class="btn btn-outline-success btn-sm">短信列表</a>
-						<span id="cate_1" class="btn btn-success btn-sm">群发短信</span>
-						<a href="member_pmone.php" class="btn btn-outline-success btn-sm">单独短信</a>
-					</td>
+					<td bgcolor="#f5f5f5" colspan="2">群发短信</td>
 				</tr>
 				<tr>
 					<td width="260">标题：</td>
-					<td><input type="text" name="subject" id="subject" class="admin-input-lg">（标题少于70个字符内）</td>
+					<td><input type="text" name="subject" id="subject" class="admin-input-lg" placeholder="标题少于70个字符内"></td>
 				</tr>
 				<tr>
-					<td><label for="pm_textarea">文档：</label></td>
-					<td><textarea name="message" id="message" class="admin-textarea-xl"></textarea>（1000个字符以内）</td>
+					<td><label for="pm_textarea">内容：</label></td>
+					<td><textarea name="message" id="message" class="admin-textarea-xl" placeholder="内容少于1000个字符"></textarea></td>
 				</tr>
 				<tr>
 					<td colspan="2" bgcolor="#f5f5f5" align="center"><input type="submit" value="提交" class="btn btn-success btn-sm"></td>

src/admin/templets/member_pmone.htm

@@ -20,6 +20,9 @@
 							<option value="outbox">发件箱</option>
 						</select>
 						<button type="submit" class="btn btn-success btn-sm">搜索</button>
+						<a href="member_pm.php" class="btn btn-outline-success btn-sm">短信列表</a>
+						<a href="member_pmall.php" class="btn btn-outline-success btn-sm">群发短信</a>
+						<span id="cate_1" class="btn btn-success btn-sm">单独短信</span>
 					</td>
 				</tr>
 			</table>
@@ -28,23 +31,22 @@
 			<input type="hidden" name="action" value="post">
 			<table align="center" class="table maintable mb-3">
 				<tr>
-					<td bgcolor="#f5f5f5" colspan="2">
-						<a href="member_pm.php" class="btn btn-outline-success btn-sm">短信列表</a>
-						<a href="member_pmall.php" class="btn btn-outline-success btn-sm">群发短信</a>
-						<span id="cate_1" class="btn btn-success btn-sm">单独短信</span>
-					</td>
+					<td bgcolor="#f5f5f5" colspan="2">单独短信</td>
 				</tr>
 				<tr>
 					<td width="260">发送到：</td>
-					<td><input type="text" name="msgtoid" value="<?php echo empty($touid)? '' : $touid?>" class="admin-input-lg"> 填写会员登录的id（网址uid=后面跟着的id）</td>
+					<td>
+						<input type="text" name="msgtoid" value="<?php echo empty($touid)? '' : $touid?>" class="admin-input-lg">
+						<span>（填写会员登录网址的uid=后面跟着的id）</span>
+					</td>
 				</tr>
 				<tr>
 					<td>标题：</td>
-					<td><input type="text" name="subject" id="subject" class="admin-input-lg">（标题少于70个字符内）</td>
+					<td><input type="text" name="subject" id="subject" class="admin-input-lg" placeholder="标题少于70个字符内"></td>
 				</tr>
 				<tr>
-					<td><label for="pm_textarea">文档：</label></td>
-					<td><textarea name="message" id="message" class="admin-textarea-xl"></textarea>（1000个字符以内）</td>
+					<td><label for="pm_textarea">内容：</label></td>
+					<td><textarea name="message" id="message" class="admin-textarea-xl" placeholder="内容少于1000个字符"></textarea></td>
 				</tr>
 				<tr>
 					<td colspan="2" bgcolor="#f5f5f5" align="center"><input type="submit" value="提交" class="btn btn-success btn-sm"></td>

src/static/ckeditor/config.js

@@ -1,8 +1,9 @@
 /**
- * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see https://ckeditor.com/legal/ckeditor-oss-license
  */
-CKEDITOR.editorConfig = function (config) {
+CKEDITOR.editorConfig = function(config) {
+	config.language = 'zh-cn';
 	config.toolbarGroups = [
 		{ name: 'mode', groups: ['mode', 'document', 'doctools'] },
 		{ name: 'cleanup', groups: ['undo', 'cleanup'] },
@@ -15,8 +16,7 @@ CKEDITOR.editorConfig = function (config) {
 		{ name: 'insert', groups: ['insert'] },
 		{ name: 'tools', groups: ['tools'] }
 	];
-	config.height = 360;
+	config.height = 350;
 	config.removePlugins = 'exportpdf,div,scayt';
-	config.extraPlugins = 'html5video,dedepagebreak,textindent';
 	config.removeButtons = 'Save,Styles,Font,NewPage,Print,Preview,Templates,Smiley,About,ShowBlocks,Iframe,Flash,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField';
 };

src/static/ckeditor/contents.css

@@ -1,6 +1,6 @@
 body {
 	line-height:1.6;
-	letter-spacing:.6px;
+	letter-spacing:0.5px;
 	font-size:14px;
 	font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
 	color:#545b62;

src/static/web/css/admin.css

@@ -16,7 +16,7 @@
 body {
 	margin:0;
 	line-height:1.6;
-	letter-spacing:.6px;
+	letter-spacing:0.5px;
 	font-size:14px;
 	font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
 	color:#545b62;

src/static/web/css/style.css

@@ -15,7 +15,7 @@
 body {
 	margin:0;
 	line-height:1.6;
-	letter-spacing:.6px;
+	letter-spacing:0.5px;
 	font-size:14px;
 	font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
 	color:#545b62;

src/static/web/js/style.js

@@ -1,7 +1,16 @@
-//滚动到页面顶部
-function gotop() {
-	$('html, body').animate({ scrollTop: 0 }, 'slow');
-}
+//返回顶部
+$(function() {
+	$(window).on('scroll', function() {
+		var scrolled = $(window).scrollTop();
+		if (scrolled > 10) $('#returntop').show();
+		if (scrolled < 10) $('#returntop').hide();
+	});
+	$('#returntop').on('click', function() {
+		$('html, body').animate({
+			scrollTop: '0'
+		}, 500);
+	});
+});
 //读写cookie函数
 function GetCookie(c_name) {
 	if (document.cookie.length > 0) {
@@ -182,15 +191,4 @@ function ErrorAddSave(id, title) {
 	ShowMsg(content, {
 		'footer': footer,
 	});
-}
-//页面加载触发
-$(document).ready(function () {
-	window.onscroll = function () { scrollFunction() };
-	function scrollFunction() {
-		if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {
-			$("#returntop").show();
-		} else {
-			$("#returntop").hide();
-		}
-	}
-});
+}

src/system/taglib/userinfo.lib.php

@@ -20,26 +20,22 @@ function lib_userinfo(&$ctag, &$refObj)
     if ($mid == 0) return "";
     $revalue = '';
     $innerText = trim($ctag->GetInnerText());
-    if(empty($innerText)) $innerText = GetSysTemplets('userinfo.htm');
-
-    $sql = "SELECT U.*,US.spacename,US.sign,AR.membername as rankname FROM `#@__member` U
-        LEFT JOIN `#@__member_space` US ON US.mid = U.mid 
-        LEFT JOIN `#@__arcrank` AR ON AR.`rank` = U.`rank`
-        WHERE U.mid='{$mid}' LIMIT 0,1 ";
-
+    if (empty($innerText)) $innerText = GetSysTemplets('userinfo.htm');
+    $sql = "SELECT U.*,US.spacename,US.sign,AR.membername as rankname FROM `#@__member` U LEFT JOIN `#@__member_space` US ON US.mid = U.mid  LEFT JOIN `#@__arcrank` AR ON AR.`rank` = U.`rank`  WHERE U.mid='{$mid}' LIMIT 0,1 ";
     $ctp = new DedeTagParse();
     $ctp->SetNameSpace('field','[',']');
     $ctp->LoadSource($innerText);
-
     $dsql->Execute('user',$sql);
     while($row = $dsql->GetArray('user'))
     {
-        if($row['matt']==10) return ''; //不显示管理员信息
+        if ($row['matt']==10) return ''; //不显示管理员信息
         $row['userurl'] = $GLOBALS['cfg_memberurl'].'/index.php?uid='.$row['userid'];
         $row['face'] = empty($row['face'])? $GLOBALS['cfg_mainsite'].'/static/web/img/admin.png' : $row['face'];
         foreach($ctp->CTags as $tagid=>$ctag)
         {
-            if(isset($row[$ctag->GetName()])){ $ctp->Assign($tagid,$row[$ctag->GetName()]); }
+            if (isset($row[$ctag->GetName()])){
+                $ctp->Assign($tagid,$row[$ctag->GetName()]);
+            }
         }
         $revalue .= $ctp->GetResult();
     }

src/theme/dedebiz/foot.htm

@@ -5,27 +5,20 @@
 	</div>
 </footer>
 <div class="scroll-top">
-	<button onclick="gotop()" id="returntop" title="返回顶部"><i class="fa fa-chevron-up"></i> </button>
+	<button id="returntop" title="返回顶部"><i class="fa fa-chevron-up"></i> </button>
 </div>
-<script src="{dede:global.cfg_cmsurl/}/static/web/js/bootstrap.min.js"></script>
-<script src="{dede:global.cfg_cmsurl/}/static/web/js/style.js"></script>
+<script src="/static/web/js/bootstrap.min.js"></script>
+<script src="/static/web/js/style.js"></script>
 {dede:statistics/}
 <script>
-	//校验是否登录
-	function CheckLogin() {
-		$.get("{dede:global.cfg_cmsurl/}/user/api.php?format=json",function(result) {
-			if (result.code === 200) {
-				$("#_login").html(`<a href="{dede:global.cfg_cmsurl/}/user" class="mr-3"><img src="${result.data.facepic}" alt="${result.data.username}" title="${result.data.username}" class="user-img-xs mr-1">${result.data.username}</a><a href="/user/pm.php" class="btn btn-primary btn-sm rounded-circle"><i class="fa fa-bell"></i></a><a href="{dede:global.cfg_cmsurl/}/user/index_do.php?fmdo=login&dopost=exit" class="btn btn-success btn-sm rounded-circle"><i class="fa fa-sign-out"></i></a>`);
-				$("#iptUsername").val(result.data.username);
-				$("#iptUsername").attr("disabled", "disabled");
-				$(".areaValidate").hide();
-			} else {
-				$(".areaValidate").show();
-			}
-		});
-	}
-	//页面加载触发
-	$(document).ready(function () {
-		CheckLogin();
+	$.get("/user/api.php?format=json",function(result) {
+		if (result.code === 200) {
+			$("#_login").html(`<a href="/user" class="mr-3"><img src="${result.data.facepic}" alt="${result.data.username}" title="${result.data.username}" class="user-img-xs mr-1">${result.data.username}</a><a href="/user/pm.php" class="btn btn-primary btn-sm rounded-circle"><i class="fa fa-bell"></i></a><a href="/user/index_do.php?fmdo=login&dopost=exit" class="btn btn-success btn-sm rounded-circle"><i class="fa fa-sign-out"></i></a>`);
+			$("#iptUsername").val(result.data.username);
+			$("#iptUsername").attr("disabled", "disabled");
+			$(".areaValidate").hide();
+		} else {
+			$(".areaValidate").show();
+		}
 	});
 </script>

src/theme/system/channel_downlinks.htm

@@ -1 +1 @@
-<li><a href="~link~" target="_blank">~server~</a></li>
+<a href="~link~" target="_blank">~server~</a>