Merge pull request 'master' (#3) from Vaecq/DedeCMSV6:master into develop

src/dede/css/frame.css

@@ -1,455 +1,78 @@
-* {
-	padding:0;
-	margin:0;
-	box-sizing:border-box
-}
-a {
-	text-decoration:none
-}
-html,body {
-	width:100%;
-	height:100%
-}
-body {
-	height:100%;
-	font-size:12px;
-	overflow:hidden;
-	z-index:1
-}
-body.showmenu {
-	background:url(../images/leftmenu_bg.gif) -10px top repeat-y
-}
-body.hidemenu {
-	background:none
-}
-ul {
-	list-style:none
-}
-form {
-	margin:0;
-	padding:0
-}
-.head {
-	width:100%;
-	height:76px;
-	overflow:hidden;
-	z-index:8;
-	position:relative
-}
-.top {
-	height:46px;
-	width:100%;
-	background-image:linear-gradient(135deg,#008E38 0%,#639709 100%);
-	overflow:hidden;
-	clear:both
-}
-.top .top_logo {
-	float:left;
-	margin-left:10px;
-	height:46px;
-	line-height:46px
-}
-.top .top_logo a {
-	font-size:18px;
-	font-weight:600;
-	color:#fff
-}
-.top .top_version {
-	display:inline-block;
-	margin-top:10px;
-	margin-left:10px;
-	color:#fff
-}
-.top .top_link {
-	float:right
-}
-.top .top_link ul {
-	float:left;
-	line-height:46px;
-	overflow:hidden
-}
-.top .top_link ul li.welcome img {
-	margin-top:-2px;
-	margin-right:10px;
-	width:30px;
-	height:30px;
-	vertical-align:middle
-}
-.top .top_link ul li {
-	float:left;
-	color:#fff
-}
-.top .top_link ul li a {
-	color:#fff;
-	padding-left:10px;
-	padding-right:10px
-}
-.top .top_link ul li a:hover {
-	color:#ccc
-}
-.top .top_link .quick {
-	padding:3px 0px 0px 0px;
-	float:left
-}
-.top .top_link .quick a {
-	display:block;
-	color:#C60;
-	float:left;
-	line-height:21px;
-	height:21px;
-	overflow:hidden
-}
-.top .top_link .quick a.ac_qucikmenu {
-	width:81px;
-	background:url(../images/quick_bg.gif) left top no-repeat;
-	letter-spacing:1px;
-	text-indent:8px
-}
-.top .top_link .quick a.ac_qucikmenu:hover {
-	background:url(../images/quick_bg.gif) left bottom no-repeat
-}
-.top .top_link .quick a.ac_qucikadd {
-	width:19px;
-	background:url(../images/quick_bg.gif) right top no-repeat
-}
-.top .top_link .quick a.ac_qucikadd:hover {
-	background:url(../images/quick_bg.gif) right bottom no-repeat
-}
-.topnav {
-	width:100%;
-	height:30px;
-	background:#333;
-	overflow:hidden;
-	clear:both
-}
-.topnav .menuact {
-	width:168px;
-	float:left;
-	padding-left:10px;
-	overflow:hidden;
-	padding-top:6px
-}
-.topnav .menuact a {
-	overflow:hidden;
-	color:#eee;
-	padding-right:10px
-}
-.topnav .menuact a:hover {
-	color:#fff
-}
-.nav {
-	float:left;
-	padding-left:2px;
-	line-height:26px;
-	color:#999
-}
-.nav ul li {
-	float:left;
-	display:block;
-	margin-left:4px
-}
-.nav ul li a {
-	padding:0 10px 0px 10px;
-	color:#FFCC00
-}
-.nav ul li a:hover {
-	color:#fff
-}
-.nav ul li a.thisclass,.nav ul li a.thisclass:hover {
-	color:#4E8100;
-	display:block;
-	font-weight:bold;
-	background:#fff;
-	line-height:23px;
-	border-top:2px solid #FFDE59;
-	margin-top:4px;
-	padding:0 10px 0px 10px
-}
-.sysmsg {
-	height:30px;
-	overflow:hidden;
-	line-height:30px;
-	padding-right:10px;
-	float:right;
-	color:#999;
-	width:500px
-}
-.sysmsg h3 {
-	font-size:12px;
-	float:left;
-	padding-right:6px;
-	font-weight:normal;
-	color:#FC0;
-	display:none
-}
-.scroll {
-	float:right;
-	overflow:hidden;
-	height:30px
-}
-.scroll ul li,.sysmsg ul li a {
-	color:#BBB
-}
-.scroll ul li {
-	height:26px;
-	overflow:hidden;
-	line-height:26px;
-	float:right;
-	clear:both;
-	padding-left:19px;
-	background:url(../images/ico-sysmsg.png) 5px 8px no-repeat
-}
-.scroll ul li a:hover {
-	text-decoration:underline
-}
-.scroll a {
-	padding-left:10px;
-	color:#fff
-}
-.scroll a:hover {
-	text-decoration:underline
-}
-body.showmenu .left {
-	display:block
-}
-body.hidemenu .left {
-	display:none
-}
-body.showmenu .right {
-	left:220px
-}
-body.hidemenu .right {
-	left:0
-}
-.left {
-	position:absolute;
-	top:76px;
-	width:220px;
-	left:0;
-	bottom:0;
-	z-index:7
-}
-.menu {
-	height:100%
-}
-.top_link {
-	font-size:12px
-}
-.menu iframe {
-	height:100%;
-	width:99.99%;
-	z-index:20
-}
-.right {
-	position:absolute;
-	right:0;
-	top:76px;
-	bottom:0;
-	z-index:7
-}
-.main {
-	height:100%
-}
-.main iframe {
-	height:100%;
-	width:99.99%;
-	z-index:20
-}
-.qucikmenu {
-	position:absolute;
-	right:10px;
-	top:32px;
-	z-index:9;
-	display:none
-}
-.qucikmenu ul {
-	width:110px;
-	list-style:none;
-	border:1px solid #E7E7E7;
-	background:#fff
-}
-.qucikmenu ul li {
-	display:block;
-	text-align:left
-}
-.qucikmenu ul li a {
-	height:30px;
-	line-height:30px;
-	display:block;
-	color:#666666;
-	padding-left:10px;
-	padding-right:10px
-}
-.qucikmenu ul li a:hover {
-	background:#F7F7F7
-}
-.pagemask {
-	width:100%;
-	height:100%;
-	background:#000;
-	position:absolute;
-	z-index:100;
-	filter:alpha(opacity=70);
-	-moz-opacity:0.7;
-	opacity:0.7;
-	display:none
-}
-.iframemask {
-	position:absolute;
-	z-index:80;
-	top:0;
-	left:0;
-	background-color:#fff;
-	border:none;
-	filter:alpha(opacity=0);
-	-moz-opacity:0;
-	opacity:0;
-	height:100%;
-	width:100%;
-	display:none
-}
-.allmenu {
-	width:800px;
-	background:#fff;
-	border:2px solid #999;
-	z-index:999;
-	position:absolute;
-	left:50%;
-	top:76px;
-	margin-left:-400px;
-	display:none;
-	padding:10px
-}
-.allmenu .allmenu-box {
-	margin:0 auto;
-	text-align:left;
-	overflow:hidden;
-	padding-left:2px
-}
-.maptop {
-	float:left;
-	width:130px;
-	overflow:hidden;
-	padding-right:6px;
-	padding-left:6px;
-	margin-left:-1px
-}
-.maptop dt.bigitem {
-	padding:5px 10px;
-	background:#333;
-	color:#fff;
-	line-height:18px;
-	font-weight:600
-}
-.mapitem dt {
-	line-height:21px;
-	font-weight:bold;
-	text-indent:10px;
-	background:#EFF1F1
-}
-.mapitem ul {
-	margin-top:10px;
-	margin-bottom:10px
-}
-.mapitem ul li {
-	text-indent:20px;
-	line-height:24px;
-	background:url(../images/arrr.gif) 4px 6px no-repeat
-}
-.allmenu a {
-	color:#5C604F
-}
-.allmenu a:hover {
-	color:#F63
-}
-#login .theme {
-	clear:both;
-	padding:10px;
-	width:70%;
-	margin-top:20px
-}
-#login .theme li {
-	margin-bottom:15px;
-	margin-top:5px;
-	overflow:hidden
-}
-#login .theme span {
-	color:#000000;
-	width:150px;
-	display:inline-block;
-	float:left;
-	text-align:right;
-	height:22px;
-	line-height:22px
-}
-input {
-	color:#000;
-	font-size:12px
-}
-input[type="text"],input[type="password"] {
-	width:160px;
-	border-width:1px;
-	border-style:solid;
-	border-color:#fff;
-	padding:2px 4px;
-	height:18px;
-	line-height:18px;
-	vertical-align:middle;
-	background:#fff
-}
-input[type="text"]:focus,input[type="password"]:focus {
-	border-color:#6FB1DF;
-	color:#333;
-	-moz-box-shadow:0 0 3px #A5C760;
-	-webkit-border-shadow:0 0 3px #A5C760;
-	box-shadow:0 0 3px #A5C760
-}
-* html input.text {
-	width:223px;
-	border:1px solid #a7a6aa;
-	background:#fff url(../images/input.gif) 0 0 no-repeat;
-	margin-top:-1px;
-	margin-right:5px;
-	margin-bottom:0;
-	margin-left:2px;
-	padding:3px;
-	line-height:12px
-}
-* html input.radio {
-	margin:-1px 0 0 -2px
-}
-.allsearch {
-	float:left;
-	margin-top:7px!important;
-	border:1px solid #fff;
-	border-radius:2px
-}
-.np {
-	width:40px;
-	height:18px;
-	line-height:18px;
-	border:none;
-	color:#fff;
-	background:#57960f;
-	cursor:pointer;
-	margin-left:10px;
-	border-radius:2px
-}
-#help {
-	background:url(../images/dlgtitle.gif) repeat-x scroll 0 0 transparent;
-	bottom:0;
-	left:0;
-	position:absolute;
-	width:100%;
-	height:28px;
-	border-top:1px solid #390;
-	line-height:28px;
-	text-align:right;
-	padding-top:0;
-	padding-bottom:0
-}
-#help #content {
-	padding-right:12px;
-	background:url(../images/gtk-edit.png) no-repeat scroll 0px -1px;
-	padding-left:20px
-}
+*{padding:0;margin:0;box-sizing:border-box}
+a{text-decoration:none}
+html,body{width:100%;height:100%}
+body{height:100%;font-size:12px;overflow:hidden;z-index:1}
+body.showmenu{background:url(../images/leftmenu_bg.gif) -10px top repeat-y}
+body.hidemenu{background:none}
+ul{list-style:none}
+form{margin:0;padding:0}
+.head{width:100%;height:76px;overflow:hidden;z-index:8;position:relative}
+.top{height:46px;width:100%;background-image:linear-gradient(135deg,#008E38 0%,#639709 100%);overflow:hidden;clear:both}
+.top .top_logo{float:left;margin-left:30px;height:46px;line-height:46px}
+.top .top_logo a{font-size:20px;font-weight:600;color:#fff}
+.top .top_version{display:inline-block;margin-top:10px;margin-left:10px;color:#fff}
+.top .top_link{float:right;margin-right:30px}
+.top .top_link ul{float:left;line-height:46px;overflow:hidden}
+.top .top_link ul li.welcome img{margin-top:-4px;margin-right:10px;width:30px;height:30px;vertical-align:middle}
+.top .top_link ul li{float:left;color:#fff}
+.top .top_link ul li a{color:#fff;padding-left:20px}
+.top .top_link ul li a:hover{color:#ccc}
+.top .top_link .quick{padding:3px 0px 0px 0px;float:left}
+.top .top_link .quick a{display:block;color:#C60;float:left;line-height:21px;height:21px;overflow:hidden}
+.top .top_link .quick a.ac_qucikmenu{width:81px;background:url(../images/quick_bg.gif) left top no-repeat;letter-spacing:1px;text-indent:8px}
+.top .top_link .quick a.ac_qucikmenu:hover{background:url(../images/quick_bg.gif) left bottom no-repeat}
+.top .top_link .quick a.ac_qucikadd{width:19px;background:url(../images/quick_bg.gif) right top no-repeat}
+.top .top_link .quick a.ac_qucikadd:hover{background:url(../images/quick_bg.gif) right bottom no-repeat}
+.topnav{width:100%;height:30px;background:#333;overflow:hidden;clear:both}
+.topnav .menuact{width:168px;float:left;padding-left:30px;overflow:hidden;padding-top:6px}
+.topnav .menuact a{overflow:hidden;color:#eee;padding-right:10px}
+.topnav .menuact a:hover{color:#fff}
+.nav{float:left;padding-left:2px;line-height:26px;color:#999}
+.nav ul li{float:left;display:block;margin-left:4px}
+.nav ul li a{padding:0 10px 0px 10px;color:#FFCC00}
+.nav ul li a:hover{color:#fff}
+.nav ul li a.thisclass,.nav ul li a.thisclass:hover{color:#4E8100;display:block;font-weight:bold;background:#fff;line-height:23px;border-top:2px solid #FFDE59;margin-top:4px;padding:0 10px 0px 10px}
+.sysmsg{height:30px;overflow:hidden;line-height:30px;padding-right:30px;float:right;color:#999;width:500px}
+.scroll{float:right;overflow:hidden;height:30px}
+.scroll ul li,.sysmsg ul li a{color:#bbb}
+.scroll ul li{height:26px;overflow:hidden;line-height:26px;float:right;clear:both;padding-left:20px;background:url(../images/ico-sysmsg.png) 5px 8px no-repeat}
+.scroll ul li a:hover{text-decoration:underline}
+.scroll a{padding-left:10px;color:#fff}
+body.showmenu .left{display:block}
+body.hidemenu .left{display:none}
+body.showmenu .right{left:220px}
+body.hidemenu .right{left:0}
+.left{position:absolute;top:76px;width:220px;left:0;bottom:0;z-index:7}
+.menu{height:100%}
+.top_link{font-size:12px}
+.menu iframe{height:100%;width:99.99%;z-index:20}
+.right{position:absolute;right:0;top:76px;bottom:0;z-index:7}
+.main{height:100%}
+.main iframe{height:100%;width:99.99%;z-index:20}
+.qucikmenu{position:absolute;right:10px;top:32px;z-index:9;display:none}
+.qucikmenu ul{width:110px;list-style:none;border:1px solid #E7E7E7;background:#fff}
+.qucikmenu ul li{display:block;text-align:left}
+.qucikmenu ul li a{height:30px;line-height:30px;display:block;color:#666;padding-left:10px;padding-right:10px}
+.qucikmenu ul li a:hover{background:#F7F7F7}
+.pagemask{width:100%;height:100%;background:#000;position:absolute;z-index:100;filter:alpha(opacity=70);-moz-opacity:.7;opacity:.7;display:none}
+.iframemask{position:absolute;z-index:80;top:0;left:0;background-color:#fff;border:none;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;height:100%;width:100%;display:none}
+.allmenu{width:800px;background:#fff;z-index:999;position:absolute;left:50%;top:76px;margin-left:-400px;display:none;padding:10px}
+.allmenu .allmenu-box{margin:0 auto;text-align:left;overflow:hidden;padding-left:2px}
+.maptop{float:left;width:130px;overflow:hidden;padding-right:6px;padding-left:6px;margin-left:-1px}
+.maptop dt.bigitem{padding:5px 10px;background:#333;color:#fff;line-height:18px;font-weight:600}
+.mapitem dt{line-height:21px;font-weight:bold;text-indent:10px;background:#EFF1F1}
+.mapitem ul{margin-top:10px;margin-bottom:10px}
+.mapitem ul li{text-indent:20px;line-height:24px;background:url(../images/arrr.gif) 4px 6px no-repeat}
+.allmenu a{color:#5C604F}
+.allmenu a:hover{color:#F63}
+#login .theme{clear:both;padding:10px;width:70%;margin-top:20px}
+#login .theme li{margin-bottom:15px;margin-top:5px;overflow:hidden}
+#login .theme span{color:#000;width:150px;display:inline-block;float:left;text-align:right;height:22px;line-height:22px}
+input[type="text"],input[type="password"]{width:140px;border-width:1px;border-style:solid;border-color:#fff;padding:2px 4px;height:18px;line-height:18px;vertical-align:middle;background:#fff}
+input[type="text"]:focus,input[type="password"]:focus{border-color:#6FB1DF;color:#333;-moz-box-shadow:0 0 3px #A5C760;-webkit-border-shadow:0 0 3px #A5C760;box-shadow:0 0 3px #A5C760}
+* html input.text{width:220px;border:1px solid #a7a6aa;background:#fff url(../images/input.gif) 0 0 no-repeat;margin-top:-1px;margin-right:5px;margin-bottom:0;margin-left:2px;padding:3px;line-height:12px}
+* html input.radio{margin:-1px 0 0 -2px}
+.allsearch{float:left;margin-top:7px!important;font-size:12px;border:1px solid #fff;border-radius:.2rem}
+.np{margin-left:10px;width:40px;height:18px;line-height:18px;font-size:12px;color:#fff;cursor:pointer;background:#57960f;border:none;border-radius:.2rem}
+#help{background:url(../images/dlgtitle.gif) repeat-x scroll 0 0 transparent;bottom:0;left:0;position:absolute;width:100%;height:28px;border-top:1px solid #390;line-height:28px;text-align:right;padding-top:0;padding-bottom:0}
+#help #content{padding-right:12px;background:url(../images/gtk-edit.png) no-repeat scroll 0px -1px;padding-left:20px}

src/dede/templets/content_list.htm

@@ -1,56 +1,45 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 	<title>文档管理</title>
 	<link rel="stylesheet" href="../static/css/bootstrap.min.css">
-	<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-	<link rel="stylesheet" type="text/css" href="css/base.css">
-	<script language="javascript" src="../static/js/jquery.js"></script>
+	<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+	<link rel="stylesheet" href="css/base.css">
+	<script src="../static/js/jquery.js"></script>
 	<script src="../static/js/bootstrap.bundle.js"></script>
-	<script language="javascript" src="../static/js/dedeajax2.js"></script>
-	<script language="javascript" src="js/ieemu.js"></script>
-	<script language="javascript" src="js/context_menu.js"></script>
-	<script language="javascript" src="js/main.js"></script>
-	<script language="javascript" src="js/list.js"></script>
+	<script src="../static/js/dedeajax2.js"></script>
+	<script src="js/ieemu.js"></script>
+	<script src="js/context_menu.js"></script>
+	<script src="js/main.js"></script>
+	<script src="js/list.js"></script>
 </head>
 
 <body leftmargin="8" topmargin="8" background='images/allbg.gif' onLoad="ContextMenu.intializeContextMenu()">
-
-	<!--  快速转换位置按钮  -->
+	<!--快速转换位置按钮-->
 	<table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" class="table maintable table-bordered mt-3">
 		<tr>
 			<td align="center">
-				<button type='button' class="btn btn-success btn-sm"
-					onClick="location='catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives';">添加文档</button>
+				<button type='button' class="btn btn-success btn-sm" onClick="location='catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives';">添加文档</button>
 				{dede:if $adminid==$mid }
-				<button type='button' class="btn btn-success btn-sm"
-					onClick="location='content_list.php?cid={dede:global.cid/}&mid=0';">全部文档</button>
+				<button type='button' class="btn btn-success btn-sm" onClick="location='content_list.php?cid={dede:global.cid/}&mid=0';">全部文档</button>
 				{else}
-				<button type='button' class="btn btn-success btn-sm"
-					onClick="location='content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID(); ?>';">我的文档</button>
+				<button type='button' class="btn btn-success btn-sm" onClick="location='content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID(); ?>';">我的文档</button>
 				{/dede:if}
 				{dede:global.CheckUserSend/}
 				<button type='button' class="btn btn-success btn-sm" onClick="location='catalog_main.php';">栏目管理</button>
-				<button type='button' class="btn btn-success btn-sm" name='bb1'
-					onClick="location='makehtml_list.php?cid={dede:global.cid/}';">更新列表</button>
-				<button type='button' class="btn btn-success btn-sm" name='bb2'
-					onClick="location='makehtml_archives.php?cid={dede:global.cid/}';">更新文档</button>
-				<button type='button' class="btn btn-success btn-sm" name='bb1'
-					onClick="location='recycling.php?cid={dede:global.cid/}';">文章回收站</button>
+				<button type='button' class="btn btn-success btn-sm" name='bb1' onClick="location='makehtml_list.php?cid={dede:global.cid/}';">更新列表</button>
+				<button type='button' class="btn btn-success btn-sm" name='bb2' onClick="location='makehtml_archives.php?cid={dede:global.cid/}';">更新文档</button>
+				<button type='button' class="btn btn-success btn-sm" name='bb1' onClick="location='recycling.php?cid={dede:global.cid/}';">文章回收站</button>
 			</td>
 		</tr>
 	</table>
-
-	<!--  内容列表   -->
+	<!--内容列表-->
 	<form name="form2">
 		<table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#CFCFCF" align="center"
 			style="margin-top:8px" class="table table-bordered maintable">
 			<tr bgcolor="#E7E7E7">
-				<td height="28" colspan="10" background="images/tbg.gif" style="padding-left:10px;">
-					◆ {dede:global.positionname/}文档列表 &nbsp;(使用鼠标右键弹出菜单)
+				<td height="28" colspan="10" background="images/tbg.gif" style="padding-left:10px;">◆ {dede:global.positionname/}文档列表 &nbsp;(使用鼠标右键弹出菜单)
 				</td>
 			</tr>
 			<tr align="center" bgcolor="#FBFCE2" height="25">
@@ -66,8 +55,7 @@
 				<td width="12%">操作</td>
 			</tr>
 			{dede:datalist}
-			<tr align='center' bgcolor="#FFFFFF" height="26" align="center"
-				onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
+			<tr align='center' bgcolor="#FFFFFF" height="26" align="center" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
 				<td nowrap>
 					{dede:field.id/}
 				</td>
@@ -85,8 +73,7 @@
 					{dede:field.flag function='IsCommendArchives(@me)'/}
 				</td>
 				<td>{dede:field.senddate function='GetDateMk(@me)'/}</td>
-				<td><a href='content_list.php?cid={dede:field.typeid/}'>{dede:field.typeid
-						function='GetTypename(@me)'/}</a></td>
+				<td><a href='content_list.php?cid={dede:field.typeid/}'>{dede:field.typeid function='GetTypename(@me)'/}</a></td>
 				<td>{dede:field.click/}</td>
 				<td>{dede:field.ismake function="IsHtmlArchives(@me)"/}</td>
 				<td>{dede:field.arcrank function="GetRankName(@me)"/}</td>
@@ -115,19 +102,17 @@
 					<a href="javascript:;" onClick="cAtts('attsDel',event,this)" class="btn btn-success btn-sm">&nbsp;删除属性&nbsp;</a>
 				</td>
 			</tr>
+			<tr align="right" bgcolor="#F9FCEF">
+				<td height="36" colspan="10" align="center">
+					{dede:pagelist listsize=3/}
+				</td>
+			</tr>
+		</table>
 	</form>
-	<tr align="right" bgcolor="#F9FCEF">
-		<td height="36" colspan="10" align="center">
-			{dede:pagelist listsize=3/}
-		</td>
-	</tr>
-	</table>
-
-	<!--  搜索表单  -->
+	<!--搜索表单-->
 	<form name='form3' action='content_list.php' method='get'>
 		<input type='hidden' name='dopost' value='listArchives' />
-		<table width='98%' border='0' cellpadding='1' cellspacing='1' bgcolor='#cfcfcf' align="center"
-			style="margin-top:8px" class="mb-3">
+		<table width='98%' border='0' cellpadding='1' cellspacing='1' bgcolor='#cfcfcf' align="center" style="margin-top:8px;border:1px solid #dee2e6" class="mb-3">
 			<tr bgcolor='#EEF4EA'>
 				<td background='images/wbg.gif' align='center'>
 					<table border='0' cellpadding='0' cellspacing='0' height="32">
@@ -169,7 +154,5 @@
 			</tr>
 		</table>
 	</form>
-
 </body>
-
 </html>

src/dede/templets/index2.htm

@@ -1,168 +1,137 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="<?php echo $cfg_soft_lang; ?>">
-  <title><?php echo $cfg_webname; ?>-<?php echo $cfg_soft_enname; ?> <?php echo $cfg_version_detail; ?></title>
-  <link rel="stylesheet" href="css/frame.css">
-  <link rel="stylesheet" href="images/style<?php echo $cfg_admin_skin;?>/style.css">
-  <script src="../static/js/jquery.js"></script>
-  <script src="js/frame.js"></script>
-  <style>
-#skinlist {
-  display:block;
-  height:11px;
-  margin-top:10px;
-  overflow:hidden;
-  width:86px
-}
-#skin div {
-  float:left
-}
-#skin li {
-  cursor:pointer;
-  float:left;
-  height:11px;
-  width:14px
-}
-#def div,#s1 div,#s2 div,#s3 div,#s4 div {
-  background-image:url("images/skinbutton.png");
-  background-repeat:no-repeat
-}
-#s1 div {
-  background-position:0 0px
-}
-#s2 div {
-  background-position:0 -11px
-}
-#s3 div {
-  background-position:0 -22px
-}
-#s4 div {
-  background-position:0 -33px
-}
-#s1 div.sel {
-  background:url("images/skinbutton.png") no-repeat scroll -14px top transparent
-}
-#s2 div.sel {
-  background:url("images/skinbutton.png") no-repeat scroll -14px -11px transparent
-}
-#s3 div.sel {
-  background:url("images/skinbutton.png") no-repeat scroll -14px -22px transparent
-}
-#s4 div.sel {
-  background:url("images/skinbutton.png") no-repeat scroll -14px -33px transparent
-}
-  </style>
+    <meta charset="<?php echo $cfg_soft_lang; ?>">
+    <title><?php echo $cfg_webname; ?>后台管理</title>
+    <link rel="stylesheet" href="css/frame.css">
+    <link rel="stylesheet" href="images/style<?php echo $cfg_admin_skin;?>/style.css">
+    <script src="../static/js/jquery.js"></script>
+    <script src="js/frame.js"></script>
+    <style>
+#skinlist{display:block;height:10px;margin-top:10px;overflow:hidden;width:86px}
+#skin div{float:left}
+#skin li{float:left;width:14px;height:10px;cursor:pointer}
+#def div,#s1 div,#s2 div,#s3 div,#s4 div{background-image:url("images/skinbutton.png");background-repeat:no-repeat}
+#s1 div{background-position:0 0px}
+#s2 div{background-position:0 -11px}
+#s3 div{background-position:0 -22px}
+#s4 div{background-position:0 -33px}
+#s1 div.sel{background:url("images/skinbutton.png") no-repeat scroll -14px top transparent}
+#s2 div.sel{background:url("images/skinbutton.png") no-repeat scroll -14px -11px transparent}
+#s3 div.sel{background:url("images/skinbutton.png") no-repeat scroll -14px -22px transparent}
+#s4 div.sel{background:url("images/skinbutton.png") no-repeat scroll -14px -33px transparent}
+    </style>
 </head>
 <body class="showmenu">
-  <div class="pagemask"></div>
-  <iframe class="iframemask"></iframe>
-  <div class="allmenu">
-    <div class="allmenu-box">
-      <?php
-	     echo $mapstring;
-      ?>
-      <br style="clear:both">
+    <div class="pagemask"></div>
+    <iframe class="iframemask"></iframe>
+    <div class="allmenu">
+        <div class="allmenu-box">
+            <?php
+            echo $mapstring;
+            ?>
+            <br style="clear:both">
+        </div>
     </div>
-  </div>
-  <div class="head">
-    <div class="top">
-      <div class="top_logo"><a href="#" onclick="JumpFrame('index_menu.php','index_body.php');"><?php echo $cfg_soft_enname; ?></a></div>
-      <div class="top_version"><?php echo $cfg_version_detail; ?></div>
-      <div class="top_link">
-        <ul>
-          <li class="welcome"><img src="/static/img/avatar.png" title="<?php echo $cuserLogin->getUserName(); ?>"><?php echo $cuserLogin->getUserName(); ?><a href="exit.php" target="_top">注销</a></li>
-          <li><a href="#" onclick="JumpFrame('index_menu.php','index_body.php');">后台主页</a></li>
-          <li><a href="#" onclick="JumpFrame('catalog_menu.php','public_guide.php');">内容发布</a></li>
-          <li><a href="#" onclick="JumpFrame('index_menu.php','content_list.php');">内容维护</a></li>
-          <li><a href="../member" target="_blank">会员中心</a></li>
-          <li><a href="../index.php?upcache=1" target="_blank">网站主页</a></li>
-        </ul>
-      </div>
+    <div class="head">
+        <div class="top">
+            <div class="top_logo"><a href="#" onclick="JumpFrame('index_menu.php','index_body.php');"><?php echo $cfg_webname; ?>系统</a></div>
+            <div class="top_version"><?php echo $cfg_version_detail; ?></div>
+            <div class="top_link">
+                <ul>
+                    <li class="welcome"><img src="/static/img/avatar.png" title="<?php echo $cuserLogin->getUserName(); ?>"><?php echo $cuserLogin->getUserName(); ?><a href="exit.php" target="_top">注销</a></li>
+                    <li><a href="#" onclick="JumpFrame('catalog_menu.php','public_guide.php');">发布文档</a></li>
+                    <li><a href="#" onclick="JumpFrame('index_menu.php','content_list.php');">所有文档</a></li>
+                    <li><a href="#" onclick="JumpFrame('index_menu.php','catalog_main.php');">栏目管理</a></li>
+                    <li><a href="#" onclick="JumpFrame('index_menu.php','file_manage_main.php');">文件管理</a></li>
+                    <li><a href="#" onclick="JumpFrame('index_menu.php','templets_main.php');">模板管理</a></li>
+                    <?php echo ($cfg_mb_open == 'Y')?'<li><a href="../member" target="_blank">会员中心</a></li>':''; ?>
+                    <li><a href="../index.php?upcache=1" target="_blank">网站主页</a></li>
+                </ul>
+            </div>
+        </div>
+        <div class="topnav">
+            <div class="menuact">
+                <a href="#" id="togglemenu">隐藏菜单</a>
+                <?php
+                if($cuserLogin->getUserType()>=10) echo'<a href="#" id="allmenu">功能地图</a>';
+                ?>
+            </div>
+            <div id="skin">
+                <div></div>
+            </div>
+            <div class="nav" id="nav"></div>
+            <div class="sysmsg">
+                <div class="scroll">
+                    <form action="action_search.php" target="main" method="post">
+                        <input name="keyword" type="text" placeholder="请输入" class="allsearch">
+                        <input name="" type="submit" value="搜索" class="np">
+                        <a href="<?php echo $cfg_biz_gitUrl;?>" target="_blank">代码托管</a>
+                        <a href="<?php echo $cfg_biz_helpUrl;?>" target="_blank">帮助中心</a>
+                    </form>
+                </div>
+            </div>
+        </div>
     </div>
-    <div class="topnav">
-      <div class="menuact"><a href="#" id="togglemenu">隐藏菜单</a>
-      <?php
-			if($cuserLogin->getUserType() >= 10) echo '<a href="#" id="allmenu">功能地图</a>';
-			?>
-      </div>
-      <div id="skin"><div>
-  </div>
-  </div>
-  <div class="nav" id="nav"></div>
-  <div class="sysmsg">
-    <h3>滚动消息:</h3>
-    <div class="scroll">
-      <form action="action_search.php" target="main" method="post">
-        <input name="keyword" type="text" value="功能搜索" onfocus="if(this.value=='功能搜索'){this.value='';}" onblur="if(this.value==''){this.value='功能搜索';}" class="allsearch">
-        <input name="" type="submit" value="搜索" class="np" />
-        <a href='<?php echo $cfg_biz_gitUrl;?>' target='_blank'>代码托管</a> <a href='<?php echo $cfg_biz_helpUrl;?>'
-          target='_blank'>帮助中心</a>
-      </form>
+    <div class="left">
+        <div class="menu" id="menu">
+            <iframe src="index_menu.php" id="menufra" name="menu" frameborder="0"></iframe>
+        </div>
     </div>
-  </div>
-  </div>
-  </div>
-  <div class="left">
-    <div class="menu" id="menu">
-      <iframe src="index_menu.php" id="menufra" name="menu" frameborder="0"></iframe>
+    <div class="right">
+        <div class="main">
+            <iframe id="main" name="main" frameborder="0" src="index_body.php"></iframe>
+        </div>
     </div>
-  </div>
-  <div class="right">
-    <div class="main">
-      <iframe id="main" name="main" frameborder="0" src="index_body.php"></iframe>
+    <div class="qucikmenu" id="qucikmenu">
+        <ul>
+        <?php
+        $dtp = new DedeTagparse();
+        $dtp->SetNameSpace('menu','<','>');
+        $dtp->LoadTemplet($myIcoFile);
+        if(is_array($dtp->CTags))
+        {
+          foreach($dtp->CTags as $ctag)
+          {
+                $title = $ctag->GetAtt('title');
+                $ico = $ctag->GetAtt('ico');
+                $link = $ctag->GetAtt('link');
+                echo "<li><a href='{$link}' target='main'>{$title}</a></li>\r\n";
+            }
+        }
+        ?>
+        </ul>
     </div>
-    <!--<div id="help"><span id="content"><a href="#">栏目管理操作使用说明</a></span></div>-->
-  </div>
-  <div class="qucikmenu" id="qucikmenu">
-    <ul>
-      <?php
-      $dtp = new DedeTagparse();
-      $dtp->SetNameSpace('menu','<','>');
-      $dtp->LoadTemplet($myIcoFile);
-      if(is_array($dtp->CTags))
-      {
-         foreach($dtp->CTags as $ctag)
-         {
-         		$title = $ctag->GetAtt('title');
-         		$ico = $ctag->GetAtt('ico');
-         		$link = $ctag->GetAtt('link');
-         		echo "<li><a href='{$link}' target='main'>{$title}</a></li>\r\n";
-      		}
-			}
-	 ?>
-    </ul>
-  </div>
-  <script language="javascript">
+    <script>
     function JumpFrame(url1, url2) {
-      jQuery('#menufra').get(0).src = url1;
-      jQuery('#main').get(0).src = url2;
+        jQuery('#menufra').get(0).src = url1;
+        jQuery('#main').get(0).src = url2;
     }
     (function ($) {
-      $("#skinlist>li").click(function () {
-        var adminskin = $(this).index() + 1;
-        var csshref = "images/style" + adminskin + "/style.css";
-        $("#skinlist>li").each(function () { $(this).children('div').attr('class', '') });
-        $("#topdedelogo").attr('src', 'images/style' + adminskin + '/admin_top_logo.gif')
-        $('link').each(function () {
-          if ($(this).attr('href').match(/style.css$/)) {
-            $(this).attr('href', csshref);
-          }
-        });
-        $(this).children('div').attr('class', 'sel');
-        $(window.frames["menu"].document).find("link").each(function () {
-          if ($(this).attr('href').match(/style.css$/)) {
-            $(this).attr('href', csshref);
-          }
-        });
-        $(window.frames["main"].document).find("link").each(function () {
-          if ($(this).attr('href').match(/style.css$/)) {
-            $(this).attr('href', csshref);
-          }
-        });
-        $.get('index_body.php?dopost=setskin&cskin=' + adminskin);
+        $("#skinlist>li").click(function () {
+          var adminskin = $(this).index() + 1;
+          var csshref = "images/style" + adminskin + "/style.css";
+          $("#skinlist>li").each(function () { $(this).children('div').attr('class', '') });
+          $("#topdedelogo").attr('src', 'images/style' + adminskin + '/admin_top_logo.gif')
+          $('link').each(function () {
+              if ($(this).attr('href').match(/style.css$/)) {
+                  $(this).attr('href', csshref);
+              }
+          });
+          $(this).children('div').attr('class', 'sel');
+          $(window.frames["menu"].document).find("link").each(function () {
+              if ($(this).attr('href').match(/style.css$/)) {
+                  $(this).attr('href', csshref);
+              }
+          });
+          $(window.frames["main"].document).find("link").each(function () {
+              if ($(this).attr('href').match(/style.css$/)) {
+                  $(this).attr('href', csshref);
+              }
+          });
+          $.get('index_body.php?dopost=setskin&cskin=' + adminskin);
       });
     })(jQuery);
-  </script>
+    </script>
 </body>
 </html>

src/dede/templets/index_body.htm

@@ -2,105 +2,72 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-    <title>DedeBIZV6系统概况</title>
+    <title>系统概况</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <base target="_self">
     <link rel="stylesheet" href="../static/css/bootstrap.min.css">
-    <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-    <link rel="stylesheet" type="text/css" href="css/base.css" />
-    <link rel="stylesheet" type="text/css" href="css/indexbody.css" />
-    <link href="images/style<?php echo $cfg_admin_skin;?>/style.css" rel="stylesheet" type="text/css" />
-    <script language="javascript" src="../static/js/jquery.js"></script>
+    <link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+    <link rel="stylesheet" href="css/base.css">
+    <link rel="stylesheet" href="css/indexbody.css">
+    <script src="../static/js/jquery.js"></script>
     <script src="../static/js/bootstrap.bundle.js"></script>
-    <script language="javascript" src="../static/js/dedeajax2.js"></script>
-    <script language="javascript" src="js/indexbody.js"></script>
-    <script language="javascript" src="js/main.js"></script>
-    <script type="text/javascript">
-        function showMore() {
-            $("#allInfo").toggle();
-            $("#allInfoTD").toggle();
-        }
-
-        $(function () {
-            $.get("index_testenv.php", function (data) {
-                if (data !== '') {
-                    $("#__testEvn").html(data);
-                }
-            });
-            $.get("index_body.php?dopost=get_seo", function (data) {
-                if (data !== '') {
-                    $("#SEOInfo").html(data);
-                }
-            });
+    <script src="../static/js/dedeajax2.js"></script>
+    <script src="js/indexbody.js"></script>
+    <script src="js/main.js"></script>
+    <script>
+    function showMore() {
+        $("#allInfo").toggle();
+        $("#allInfoTD").toggle();
+    }
+    $(function () {
+        $.get("index_testenv.php", function (data) {
+            if (data !== '') {
+                $("#__testEvn").html(data);
+            }
         });
+        $.get("index_body.php?dopost=get_seo", function (data) {
+            if (data !== '') {
+                $("#SEOInfo").html(data);
+            }
+        });
+    });
     </script>
     <style>
-        .row {
-            display: flex;
-            flex-wrap: wrap;
-        }
-
-        .row>[class*='col-'] {
-            display: flex;
-            flex-direction: column;
-        }
-
-        .footer {
-            padding: 10px;
-        }
+.row{display:flex;flex-wrap:wrap}
+.row>[class*='col-']{display:flex;flex-direction:column}
+.btn+.btn{margin-left:10px}
     </style>
 </head>
-
 <body>
     <div class="container-fluid">
-        <div class="mt-3 mb-3">
-            欢迎使用国内流行的内容管理系统（CMS）多端全媒体解决方案 -- <?php echo $cfg_softname; ?>
-        </div>
+        <div class="mt-3 mb-3">欢迎使用国内流行的内容管理系统多端全媒体解决方案 -- <?php echo $cfg_softname; ?></div>
         <div class="row">
             <div id="__testEvn" class="col-md-12"></div>
-            <!--/#__testEvn-->
             <div class="col-md-6 mt-3 updatenews">
                 <div class="card">
-                    <div class="card-header">
-                        <?php echo $cfg_soft_enname; ?> 更新消息
-                    </div>
-                    <!--/.card-header-->
+                    <div class="card-header">更新消息</div>
                     <div class="card-body">
                         <div id="updateinfos">
                             <?php
-                                echo "<div class='updatedvt py-3'>";
-                                echo "安全操作：<a href='sys_data.php' class='btn btn-success btn-sm'>数据备份/还原</a> <a href='sys_safetest.php' class='btn btn-success btn-sm'>病毒扫描</a> <a href='sys_repair.php' class='btn btn-success btn-sm'>错误修复</a></div>";
-                                echo "<iframe name='stafrm' src='{$offUrl}&uptime={$oktime}' frameborder='0' id='stafrm' width='98%' height='100'></iframe>";
+                            echo "<div class='updatedvt py-3'>";
+                            echo "安全操作：<a href='sys_data.php' class='btn btn-success btn-sm'>备份还原</a><a href='sys_safetest.php' class='btn btn-success btn-sm'>病毒扫描</a><a href='sys_repair.php' class='btn btn-success btn-sm'>错误修复</a></div>";
+                            echo "<iframe name='stafrm' src='{$offUrl}&uptime={$oktime}' frameborder='0' id='stafrm' width='98%' height='100'></iframe>";
                             ?>
                         </div>
                     </div>
-                    <!--/.card-body-->
                 </div>
-                <!--/.card-->
             </div>
 
             <div class="col-md-6 mt-3">
                 <div class="card">
-                    <div class="card-header">
-                        <?php echo $cfg_soft_enname; ?> 商业服务授权
-                    </div>
-                    <!--/.card-header-->
-                    <div class="card-body" id="_systeminfo">
-                        正在载入中...
-                    </div>
-                    <!--/.card-body-->
+                    <div class="card-header">商业授权</div>
+                    <div class="card-body" id="_systeminfo">正在载入中...</div>
                 </div>
-                <!--/.card-->
             </div>
 
             <div class="col-md-6 mt-3">
                 <div class="card">
-                    <div class="card-header">
-                        快捷操作
-                        <a href="javascript:AddNew()" class="btn btn-success btn-sm">新增</a>
-                        <a href="javascript:ListAll()" class="btn btn-success btn-sm">管理</a>
-                    </div>
-                    <!--/.card-header-->
+                    <div class="card-header">快捷操作<span class="float-right"><a href="javascript:AddNew()" class="btn btn-success btn-sm">新增</a><a href="javascript:ListAll()" class="btn btn-success btn-sm">管理</a></span></div>
                     <div class="card-body">
                         <ul class="nav">
                             <?php
@@ -110,102 +77,92 @@
                             if(is_array($dtp->CTags)){
                                 foreach($dtp->CTags as $ctag){
                                     $title = $ctag->GetAtt('title');
-                                    $ico = $ctag->GetAtt('ico');
                                     $link = $ctag->GetAtt('link');
-                                    echo "<li class='nav-item'><a class='nav-link' href='{$link}'><img src='{$ico}'> {$title}</a></li>\r\n";
+                                    echo "<a href='{$link}' class='btn btn-success btn-sm'>{$title}</a>";
                                 }
                             }
                         ?>
                         </ul>
                     </div>
-                    <!--/.card-body-->
                 </div>
-                <!--/.card-->
             </div>
 
             <div class="col-md-6 mt-3">
                 <div class="card">
-                    <div class="card-header">
-                        系统基本信息
-                    </div>
-                    <!--/.card-header-->
+                    <div class="card-header">基本信息</div>
                     <div class="card-body">
                         <table width="98%" class="table table-borderless">
                             <tr>
-                                <td width="25%" class='nline' style="text-align:right">您的级别：</td>
-                                <td class='nline'>
+                                <td width="25%" class="nline" style="text-align:right">您的级别：</td>
+                                <td class="nline">
                                     <?php
-                                if($cuserLogin->getUserType()==10) {
-                                    echo "总管理员";
-                            } else if($cuserLogin->getUserType()==5) {
-                                echo "频道总编";
-                            } else {
-                                echo "信息采集员或其它管理员";
-                            }
-                        ?>
-                                    <a href="javascript:showMore()" class="btn btn-success btn-sm">查看更多</a></td>
+                                    if($cuserLogin->getUserType()==10) {
+                                        echo "总管理员";
+                                    } else if($cuserLogin->getUserType()==5) {
+                                        echo "频道总编";
+                                    } else {
+                                    echo "信息采集员或其它管理员";
+                                    }
+                                    ?>
+                                    <a href="javascript:showMore()" class="btn btn-success btn-sm">查看更多</a>
+                                </td>
                             </tr>
                             <tr>
-                                <td colspan="2" class='nline' id="allInfoTD" style="display:none">
-                                    <table width="100%" border="0" cellspacing="0" cellpadding="0" id="allInfo"
-                                        style="display:none">
+                                <td colspan="2" class="nline" id="allInfoTD" style="display:none">
+                                    <table width="100%" border="0" cellspacing="0" cellpadding="0" id="allInfo" style="display:none">
                                         <tr>
-                                            <td rowspan="5" class='nline' style="text-align:right">PHP环境摘要：</td>
-                                            <td class='nline' style="text-align:left">
-                                                PHP版本：<?php echo @phpversion(); ?>&nbsp;GD版本：<?php echo @gdversion(); ?>
+                                            <td class="nline" style="text-align:right" rowspan="5">PHP环境摘要：</td>
+                                            <td class="nline" style="text-align:left">
+                                                <span style="margin-right:10px">PHP版本：<?php echo @phpversion(); ?></span>
+                                                <span>GD版本：<?php echo @gdversion(); ?></span>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class='nline' style="text-align:left">是否安全模式：<font color='red'>
-                                                    <?php echo ($isSafeMode ? 'On' : 'Off')?></font>
+                                            <td class="nline" style="text-align:left">是否安全模式：<?php echo ($isSafeMode ? 'On' : 'Off')?>
                                                 <?php
-                                if($isSafeMode) {
-                                    echo "<br>　　<font color='blue'>由于您的系统以安全模式运行，为了确保程序兼容性，第一次进入本系统时请更改“<a href='sys_info.php'><u>更改系统参数</u></a>”里的FTP选项，并选择用FTP形式创建目录</font>";
-                                }
-                            ?>
+                                                if($isSafeMode) {
+                                                echo "由于您的系统以安全模式运行，为了确保程序兼容性，第一次进入本系统时请更改 <a href='sys_info.php' class='btn btn-success btn-smm'>更改系统参数</a> 里的FTP选项，并选择用FTP形式创建目录";
+                                                }
+                                                ?>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class='nline' style="text-align:left">
-                                                Register_Globals：<font color='red'>
-                                                    <?php echo ini_get("register_globals") ? 'On' : 'Off'?></font>
-                                                &nbsp;
-                                                Magic_Quotes_Gpc：<font color='red'>
-                                                    <?php echo ini_get("magic_quotes_gpc") ? 'On' : 'Off'?></font>
+                                            <td class="nline" style="text-align:left">
+                                                <span style="margin-right:10px">Register_Globals：<?php echo ini_get("register_globals") ? 'On' : 'Off'?></span>
+                                                <span>Magic_Quotes_Gpc：<?php echo ini_get("magic_quotes_gpc") ? 'On' : 'Off'?></span>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class='nline' style="text-align:left">
-                                                支持上传的最大文件：<?php echo ini_get("post_max_size")?></td>
+                                            <td class="nline" style="text-align:left">支持上传的最大文件：<?php echo ini_get("post_max_size")?></td>
                                         </tr>
                                         <tr>
-                                            <td class='nline' style="text-align:left">
-                                                是否允许打开远程连接：<?php echo ini_get("allow_url_fopen") ? '支持' : '不支持'; ?></td>
+                                            <td class="nline" style="text-align:left">是否允许打开远程连接：<?php echo ini_get("allow_url_fopen") ? '支持' : '不支持'; ?></td>
                                         </tr>
                                         <tr>
-                                            <td class='nline' style="text-align:right"> 其它必须函数检测：</td>
-                                            <td class='nline' style="text-align:left">
+                                            <td class="nline" style="text-align:right">其它必须函数检测：</td>
+                                            <td class="nline" style="text-align:left">
                                                 <?php
-                                $needfunc = array('dir','phpinfo');
-                                $n = 0;
-                                foreach($needfunc as $k) {
-                                    if(!function_exists($k)) {
-                                        echo "<font color='red'>[{$k}×]</font> ";
-                                        $n++;
-                                    }
-                                }
-                                if($n==0) {
-                                    echo "符合要求";
-                                } else {
-                                echo "被禁用的函数可能导致部份功能无法使用！";
-                                }
-                            ?>
+                                                $needfunc = array('dir','phpinfo');
+                                                $n = 0;
+                                                foreach($needfunc as $k) {
+                                                    if(!function_exists($k)) {
+                                                        echo "<span class='btn btn-danger'>[{$k}×]</span> ";
+                                                        $n++;
+                                                    }
+                                                }
+                                                if($n==0) {
+                                                    echo "符合要求";
+                                                } else {
+                                                    echo "被禁用的函数可能导致部份功能无法使用";
+                                                }
+                                                ?>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class='nline' style="text-align:right"> 软件版本信息： </td>
-                                            <td class='nline' style="text-align:left">
-                                                版本名称：<?php echo $cfg_soft_enname; ?>&nbsp;版本号：<?php echo $cfg_version; ?>
+                                            <td class="nline" style="text-align:right">软件版本信息：</td>
+                                            <td class="nline" style="text-align:left">
+                                                <span style="margin-right:10px">版本名称：<?php echo $cfg_soft_enname; ?></span>
+                                                <span>版本号：<?php echo $cfg_version; ?></span>
                                             </td>
                                         </tr>
                                     </table>
@@ -213,33 +170,21 @@
                             </tr>
                         </table>
                     </div>
-                    <!--/.card-body-->
                 </div>
-                <!--/.card-->
             </div>
 
             <div class="col-md-6 mt-3">
                 <div class="card">
-                    <div class="card-header">
-                        信息统计
-                    </div>
-                    <!--/.card-header-->
+                    <div class="card-header">信息统计</div>
                     <div class="card-body">
-                        <dd id='listCount'>
-                            正在载入中...
-                        </dd>
+                        <dd id='listCount'>正在载入中...</dd>
                     </div>
-                    <!--/.card-body-->
                 </div>
-                <!--/.card-->
             </div>
 
             <div class="col-md-6 mt-3">
                 <div class="card">
-                    <div class="card-header">
-                        最新文档
-                    </div>
-                    <!--/.card-header-->
+                    <div class="card-header">最新文档</div>
                     <div class="card-body">
                         <?php
                         $query = "SELECT arc.id, arc.arcrank, arc.title, arc.channel, ch.editcon  FROM `#@__archives` arc
@@ -262,86 +207,62 @@
                                     $row['editcon'] = 'archives_edit.php';
                                 }
                                 $linkstr = "<a href='{$row['editcon']}?aid={$row['id']}&channelid={$row['channel']}'>{$row['title']}</a>";
-                                if($row['arcrank']==-1) $linkstr .= "<span class='btn btn-success btn-sm'>未审核</span>";
+                                if($row['arcrank']==-1) $linkstr .= " <span class='btn btn-success btn-sm'>未审核</span>";
                             ?>
                             <tr>
-                                <td class='nline' style="text-align:left">
-                                    <?php echo $linkstr; ?>
-                                </td>
+                                <td class="nline" style="text-align:left"><?php echo $linkstr; ?></td>
                             </tr>
                             <?php
                             }
-                        } else {
-                        ?>
+                            } else {
+                            ?>
                             <tr>
-                                <td class='nline' style="text-align:left">
-                                    暂无新增内容
-                                </td>
+                                <td class="nline" style="text-align:left">暂无新增内容</td>
                             </tr>
-                            <?php
+                        <?php
                         }
                         ?>
                         </table>
                     </div>
-                    <!--/.card-body-->
                 </div>
-                <!--/.card-->
             </div>
         </div>
     </div>
 
-
     <div class="footer">
-        <!-- //底部 -->
-        <div align="center" class="footer"><?php echo $cfg_powerby; ?> Powered by <a href="http://www.dedebiz.com" title="DedeBiz商业技术支持，提供更专业强大的站点应用开发技术">DedeBIZ <?php echo $cfg_version; ?></div>
-
-        <!--  下面是隐藏的项目  -->
-        <div id='loaddiv' style='display:none'>
-            <p align='center' style='padding-top:200px'><img src='images/loadinglit.gif'> 请稍后，正在下载更新文件列表...</p>
+        <!--下面是隐藏的项目-->
+        <div id="loaddiv" style="display:none">
+            <p align="center" style="padding-top:200px"><img src="images/loadinglit.gif">请稍后，正在下载更新文件列表...</p>
         </div>
         <div id="editTab">
-            <span id='editTabBody'>请稍候，正在载入...</span>
+            <span id="editTabBody">请稍候，正在载入...</span>
         </div>
         <div id="addTab">
-            <form name='addform' action='index_body.php'>
-                <input type='hidden' name='dopost' value='addnew' />
+            <form name="addform" action="index_body.php">
+                <input type="hidden" name="dopost" value="addnew">
                 <table width="100%" border="0" cellspacing="0" cellpadding="0">
                     <tr>
-                        <td height='28' colspan='3' background="images/tbg.gif">
-                            <div style='float:left'><b>增加快捷操作项</b></div>
-                            <div style='float:right;padding:4px 10px 0 0'>
-                                <a href="javascript:CloseTab('addTab')"><img src="images/close.gif" width="12"
-                                        height="12" border="0" /></a>
+                        <td height="28" colspan="3" background="images/tbg.gif">
+                            <div style="float:left">增加快捷操作项</div>
+                            <div style="float:right;padding:4px 10px 0 0">
+                                <a href="javascript:CloseTab('addTab')"><img src="images/close.gif" width="12" height="12" border="0"></a>
                             </div>
                         </td>
                     </tr>
                     <tr>
-                        <td style="height:6px;font-size:1px;border-top:1px solid #8DA659" colspan="2">&nbsp;</td>
+                        <td style="height:6px;font-size:1px;border-top:1px solid #8DA659" colspan="2"></td>
                     </tr>
                     <tr>
                         <td width="20%" height="28" align="right">链接标题：</td>
-                        <td width="70%">
-                            <input name="title" type="text" id="title" class='pubinputs' style="width:255px;" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td height="28" width="20%" align="right">ICO图片：</td>
-                        <td width="70%">
-                            <input name="ico" type="text" id="ico" class='pubinputs' style="width:255px;" />
-                        </td>
+                        <td width="70%"><input name="title" type="text" id="title" class="pubinputs" style="width:255px"></td>
                     </tr>
                     <tr>
                         <td height="28" width="20%" align="right">链接网址：</td>
-                        <td width="70%">
-                            <input name="link" type="text" id="link" class='pubinputs' style="width:255px;" />
-                        </td>
+                        <td width="70%"><input name="link" type="text" id="link" class="pubinputs" style="width:255px"></td>
                     </tr>
                     <tr>
-                        <td height="45">&nbsp;</td>
-                        <td>
-                            <input type="submit" name="Submit" value="保存项目" class="np coolbg"
-                                style="width:80px;cursor:pointer" />
-                        </td>
+                        <td height="36"></td>
+                        <td><input type="submit" name="Submit" value="保存项目" class="np coolbg" style="width:80px;cursor:pointer"></td>
                     </tr>
                 </table>
             </form>
@@ -349,38 +270,33 @@
     </div>
 
     <script>
-
         var dedebizInfo;
-
         function ViewDedeBIZ() {
             console.log(dedebizInfo);
             ShowMsg(`
-            <table width="100%" class="table table-borderless"><tbody>
-                        <tr>
-                            <td class="nline" style="text-align:left"> 版本号： </td>
-                            <td class="nline" style="text-align:left"> v${dedebizInfo.result.server_version} </td>
-                        </tr>
-                        
-                        <tr>
-                            <td class="nline" style="text-align:left"> 运行时间： </td>
-                            <td class="nline" style="text-align:left"> ${dedebizInfo.result.server_run_time} </td>
-                        </tr>
-                        
-                        <tr>
-                            <td class="nline" style="text-align:left"> 服务器系统： </td>
-                            <td class="nline" style="text-align:left"> ${dedebizInfo.result.server_goos}（${dedebizInfo.result.server_goarch}） </td>
-                        </tr>
-                        
-                        <tr>
-                            <td class="nline" style="text-align:left"> 内存占用： </td>
-                            <td class="nline" style="text-align:left"> ${dedebizInfo.result.server_memory_usage}% </td>
-                        </tr>
-                        </tbody></table>
-            
+            <table width="100%" class="table table-borderless">
+                <tbody>
+                    <tr>
+                        <td class="nline" style="text-align:left">版本号：</td>
+                        <td class="nline" style="text-align:left">v${dedebizInfo.result.server_version} </td>
+                    </tr>
+                    <tr>
+                        <td class="nline" style="text-align:left">运行时间：</td>
+                        <td class="nline" style="text-align:left">${dedebizInfo.result.server_run_time} </td>
+                    </tr>
+                    <tr>
+                        <td class="nline" style="text-align:left">服务器系统：</td>
+                        <td class="nline" style="text-align:left">${dedebizInfo.result.server_goos}（${dedebizInfo.result.server_goarch}） </td>
+                    </tr>
+                    <tr>
+                        <td class="nline" style="text-align:left">内存占用：</td>
+                        <td class="nline" style="text-align:left">${dedebizInfo.result.server_memory_usage}% </td>
+                    </tr>
+                </tbody>
+            </table>
             `);
         }
-
-        // 加载服务信息
+        //加载服务信息
         function LoadServer() {
             $.get("index_body.php?dopost=system_info", function (data) {
                 let rsp = JSON.parse(data);
@@ -389,55 +305,53 @@
                     if (typeof rsp.result.domain !== "undefined") {
                         infoStr += `
                         <tr>
-                            <td class="nline" style="text-align:left"> 授权域名： </td>
-                            <td class="nline" style="text-align:left"> ${rsp.result.domain} <a href="<?php echo $cfg_biz_dedebizUrl;?>/auth/?domain=${rsp.result.domain}"><b>【查看】</b></a> </td>
+                            <td class="nline" style="text-align:left">授权域名：</td>
+                            <td class="nline" style="text-align:left">${rsp.result.domain} <a href="<?php echo $cfg_biz_dedebizUrl;?>/auth/?domain=${rsp.result.domain}"><b>【查看】</b></a></td>
                         </tr>
                         `;
                     }
                     if (typeof rsp.result.title !== "undefined") {
                         infoStr += `
                         <tr>
-                            <td class="nline" style="text-align:left"> 站点名称： </td>
-                            <td class="nline" style="text-align:left"> ${rsp.result.title} </td>
+                            <td class="nline" style="text-align:left">站点名称：</td>
+                            <td class="nline" style="text-align:left">${rsp.result.title} </td>
                         </tr>
                         `;
                     }
                     if (typeof rsp.result.stype !== "undefined") {
                         infoStr += `
                         <tr>
-                            <td class="nline" style="text-align:left"> 站点类型： </td>
-                            <td class="nline" style="text-align:left"> ${rsp.result.stype} </td>
+                            <td class="nline" style="text-align:left">站点类型：</td>
+                            <td class="nline" style="text-align:left">${rsp.result.stype} </td>
                         </tr>
                         `;
                     }
                     if (typeof rsp.result.auth_version !== "undefined" && typeof rsp.result.auth_at !== "undefined") {
                         infoStr += `
                         <tr>
-                            <td class="nline" style="text-align:left"> 授权版本： </td>
-                            <td class="nline" style="text-align:left"> v${rsp.result.auth_version}.x.x（时间：${rsp.result.auth_at}）</td>
+                            <td class="nline" style="text-align:left">授权版本：</td>
+                            <td class="nline" style="text-align:left">v${rsp.result.auth_version}.x.x（时间：${rsp.result.auth_at}）</td>
                         </tr>
                         `;
                     }
-
                     if (rsp.result.core === null || rsp.result.core.code != 200) {
-                        // 下面是DedeBIZ Core组件信息
+                        //下面是DedeBIZ Core组件信息
                         infoStr += `
                         <tr>
-                            <td class="nline" style="text-align:left"> 商业组件： </td>
-                            <td class="nline" style="text-align:left"> <a class="btn btn-danger btn-sm" target="_blank" href="<?php echo $cfg_biz_dedebizUrl;?>/start?code=-1008">如何启动组件</a> </td>
+                            <td class="nline" style="text-align:left">商业组件：</td>
+                            <td class="nline" style="text-align:left"><a class="btn btn-danger btn-sm" target="_blank" href="<?php echo $cfg_biz_dedebizUrl;?>/start?code=-1008">如何启动组件</a> </td>
                         </tr>
                         `;
                     } else {
                         dedebizInfo = JSON.parse(rsp.result.core.data);
                         infoStr += `
                         <tr>
-                            <td class="nline" style="text-align:left"> 商业组件： </td>
-                            <td class="nline" style="text-align:left"> <a class="btn btn-success btn-sm" href="javascript:ViewDedeBIZ()">查看组件信息</a> </td>
+                            <td class="nline" style="text-align:left">商业组件：</td>
+                            <td class="nline" style="text-align:left"><a class="btn btn-success btn-sm" href="javascript:ViewDedeBIZ()">查看组件信息</a> </td>
                         </tr>
                         `;
                     }
                     infoStr += "</tbody></table>";
-
                     $("#_systeminfo").html(infoStr);
                 } else {
                     $("#_systeminfo").html(`
@@ -448,7 +362,6 @@
                 }
             });
         }
-
         $(document).ready(function () {
             LoadServer();
             setInterval(function () {
@@ -457,5 +370,4 @@
         });
     </script>
 </body>
-
 </html>

src/dede/templets/index_menu2.htm

@@ -2,125 +2,49 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 	<title>DedeBIZ menu</title>
-	<link rel="stylesheet" href="css/base.css" type="text/css" />
-	<script language="javascript" type="text/javascript" src="../static/js/dedeajax2.js"></script>
-	<script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
+	<link rel="stylesheet" href="css/base.css">
+	<script src="../static/js/dedeajax2.js"></script>
+	<script src="../static/js/jquery.js"></script>
 	<?php
-	echo "<script language='javascript'>var curopenItem = '$openitem';</script>";
+	echo "<script>var curopenItem = '$openitem';</script>";
 	?>
-	<script language="javascript" type="text/javascript" src="js/leftmenu.js"></script>
+	<script src="js/leftmenu.js"></script>
 	<style>
-body {
-	margin:0;
-	background:#f2f2f2 url(images/leftmenu_bg.gif);
-	padding-left:6px;
-	overflow:scroll;
-	overflow-x:hidden
-}
-div {
-	margin:0;
-	padding:0
-}
-dl.bitem {
-	margin:0 0 6px 10px;
-	width:140px;
-	background:url(images/menunewbg.gif) repeat-x;
-	clear:both
-}
-dl.bitem2 {
-	margin:0 0 6px 10px;
-	width:140px;
-	background:url(images/menunewbg2.gif) repeat-x;
-	clear:both
-}
-dl.bitem dt,dl.bitem2 dt {
-	padding-left:36px;
-	height:26px;
-	line-height:26px;
-	cursor:pointer
-}
-dl.bitem dt b,dl.bitem2 dt b {
-	color:#4D6C2F
-}
-dl.bitem dd,dl.bitem2 dd {
-	padding:6px;
-	background-color:#fff
-}
-div.items {
-	clear:both;
-	padding:0;
-	height:0
-}
-.fllct {
-	float:left;
-	width:80px
-}
-.flrct {
-	float:left;
-	padding-top:4px
-}
-.sitemu li {
-	padding:0 0 0 18px;
-	height:26px;
-	line-height:26px;
-	background:url(images/arr4.gif) no-repeat 6px 10px
-}
-a.mmac div {
-	padding:8px 4px 4px 10px;
-	height:38px!important;
-	font-weight:600;
-	color:#325304;
-	background:url(images/leftbg2.gif) no-repeat;
-	word-wrap:break-word;
-	word-break:break-all
-}
-a.mm div {
-	padding:8px 4px 4px 10px;
-	height:38px!important;
-	font-weight:600;
-	color:#475645;
-	cursor:pointer;
-	background:url(images/leftmbg1.gif) no-repeat;
-	word-wrap:break-word;
-	word-break:break-all
-}
-a.mm:hover div {
-	color:#4f7632;
-	background:url(images/leftbg2.gif) no-repeat
-}
-.mmf {
-	padding:6px;
-	height:1px
-}
-#mainct {
-	padding-top:12px;
-	background:url(images/idnbg1.gif) repeat-y
-}
+body{margin:0;background:#f2f2f2 url(images/leftmenu_bg.gif);padding-left:6px;overflow:scroll;overflow-x:hidden}
+div{margin:0;padding:0}
+img{margin-right:0}
+dl.bitem{margin:0 0 6px 10px;width:140px;background:url(images/menunewbg.gif) repeat-x;clear:both}
+dl.bitem2{margin:0 0 6px 10px;width:140px;background:url(images/menunewbg2.gif) repeat-x;clear:both}
+dl.bitem dt,dl.bitem2 dt{padding-left:30px;height:26px;line-height:26px;cursor:pointer}
+dl.bitem dt b,dl.bitem2 dt b{color:#4D6C2F}
+dl.bitem dd,dl.bitem2 dd{padding:10px;background-color:#fff}
+div.items{clear:both;padding:0;height:0}
+.fllct{float:left;width:80px}
+.flrct{float:left;padding-top:4px}
+.sitemu li{padding:0 0 0 20px;height:26px;line-height:26px;background:url(images/arr4.gif) no-repeat 6px 10px}
+a.mmac div{padding:8px 4px 4px 10px;height:38px!important;font-weight:600;color:#325304;background:url(images/leftbg2.gif) no-repeat;word-wrap:break-word;word-break:break-all}
+a.mm div{padding:8px 4px 4px 10px;height:38px!important;font-weight:600;color:#475645;cursor:pointer;background:url(images/leftmbg1.gif) no-repeat;word-wrap:break-word;word-break:break-all}
+a.mm:hover div{color:#4f7632;background:url(images/leftbg2.gif) no-repeat}
+.mmf{padding:6px;height:1px}
+#mainct{padding-top:12px;background:url(images/idnbg1.gif) repeat-y}
 	</style>
-	<link href="images/style<?php echo $cfg_admin_skin;?>/style.css" rel="stylesheet" type="text/css" />
-	<base target="main" />
+	<link rel="stylesheet" href="images/style<?php echo $cfg_admin_skin;?>/style.css">
+	<base target="main">
 </head>
 
 <body target="main" onLoad="CheckOpenMenu();">
 	<table width="180" align="left" border='0' cellspacing='0' cellpadding='0' style="text-align:left;">
 		<tr>
-			<td valign='top' style='padding-top:10' width='20'><a id='link1' class='mmac'>
-					<div onClick="ShowMainMenu(1)">核心</div>
-				</a> <a id='link100' class='mm'>
-					<div onClick="ShowMainMenu(100)">模块</div>
-				</a> <a id='link5' class='mm'>
-					<div onClick="ShowMainMenu(5)">生成</div>
-				</a> <a id='link6' class='mm'>
-					<div onClick="ShowMainMenu(6)">会员</div>
-				</a>
+			<td valign='top' style='padding-top:10' width='20'>
+				<a id='link1' class='mmac'><div onClick="ShowMainMenu(1)">核心</div></a>
+				<a id='link100' class='mm'><div onClick="ShowMainMenu(100)">模块</div></a>
+				<a id='link5' class='mm'><div onClick="ShowMainMenu(5)">生成</div></a>
+				<a id='link6' class='mm'><div onClick="ShowMainMenu(6)">会员</div></a>
 				<?php
 				if($cuserLogin->getUserType() >= 10) {
 				?>
-				<a id='link7' class='mm'>
-					<div onClick="ShowMainMenu(7)">模板</div>
-				</a> <a id='link10' class='mm'>
-					<div onClick="ShowMainMenu(10)">系统</div>
-				</a>
+				<a id='link7' class='mm'><div onClick="ShowMainMenu(7)">模板</div></a>
+				<a id='link10' class='mm'><div onClick="ShowMainMenu(10)">系统</div></a>
 				<?php
 				}
 				?>
@@ -143,23 +67,23 @@ a.mm:hover div {
 		</tr>
 		<tr>
 			<td width='26'></td>
-			<td width='160' valign='top'><img src='images/idnbgfoot.gif' /></td>
+			<td width='160' valign='top'><img src='images/idnbgfoot.gif'></td>
 		</tr>
 	</table>
 	<?php
 	if(!empty($openitem) && $openitem!=1)
 	{
 	?>
-	<script language='javascript'>
-		ShowMainMenu(100);
+	<script>
+	ShowMainMenu(100);
 	</script>
 	<?php
 	}
 	?>
-	<script language="javascript">
-		function myAlert() {
-			alert('dede');
-		}
+	<script>
+	function myAlert() {
+		alert('dede');
+	}
 	</script>
 </body>
 </html>

src/dede/templets/login.htm

@@ -1,54 +1,33 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="zh-CN">
-
 <head>
 	<meta charset="<?php echo $cfg_soft_lang; ?>">
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 	<link rel="stylesheet" href="../static/css/bootstrap.min.css">
 	<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
 	<link rel="stylesheet" href="../static/css/dede.css">
-	<title><?php echo $cfg_webname; ?>后台登录-<?php echo $cfg_soft_enname; ?> <?php echo $cfg_version_detail; ?></title>
+	<title><?php echo $cfg_webname; ?>后台登录</title>
 	<style>
-body {
-	font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
-	background-color:#f2f2f2
-}
-header {
-	background-color:#fff
-}
-header .logo {
-	width:260px;
-	padding:1em 0
-}
-.login-from {
-	max-width:620px;
-	width:100%
-}
-.login-area {
-	background-color:#fff;
-	padding:1em
-}
-.login-area .btnLogin {
-	width:100%
-}
-.login-power {
-	padding:1em 0
-}
-.login-power a,.goindex a {
-	color:#3DB058
-}
-.goindex {
-	line-height:60px
-}
+body{font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;background-color:#f2f2f2}
+header{background:#fff}
+header .logo{width:260px;padding:1em 0}
+.login-from{max-width:580px;width:100%}
+.login-area{background-color:#fff;padding:2em}
+.login-area .btnLogin{width:100%}
+.login-power{padding-top:1em}
+.login-power a,.goindex a{color:#3DB058}
+.goindex{line-height:60px}
 	</style>
 </head>
 <body>
 	<header>
 		<div class="container top">
 			<div class="row">
-				<div class="col-6"><a href="."><img class="logo" src="../static/img/admin-logo.png" alt="<?php echo $cfg_soft_enname; ?>"></a></div>
+				<div class="col-6">
+					<a href="."><img class="logo" src="../static/img/admin-logo.png" title="<?php echo $cfg_soft_enname; ?>"></a>
+				</div>
 				<div class="col-6 d-flex justify-content-end goindex">
-					<a href="../index.php"><i class="fa fa-home" aria-hidden="true"></i></a>
+					<a href="../index.php" target="_blank"><i class="fa fa-home" aria-hidden="true"></i></a>
 				</div>
 			</div>
 		</div>
@@ -71,16 +50,22 @@ header .logo {
 					<label for="iptPassword">密码</label>
 					<input type="password" name="pwd" class="form-control" id="iptPassword">
 				</div>
+	   			<?php
+        		if(preg_match("/6/",$safe_gdopen))
+        		{
+        		?>
 				<div class="form-group">
 					<label for="iptValidate">验证码</label>
 					<div class="input-group">
 						<input type="text" name="validate" class="form-control" id="iptValidate" style="text-transform:uppercase">
-						<img src="../plus/vdimgck.php" id="validateimg" style="cursor:pointer" onclick="this.src='../plus/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
+						<img src="../plus/vdimgck.php" onclick="this.src='../plus/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码" id="validateimg" style="cursor:pointer">
 					</div>
 				</div>
+				<?php
+       			}
+				?>
 				<button type="submit" class="btn btn-success btnLogin">登录</button>
-				<div class="login-power"><?php echo $cfg_powerby; ?> Powered by <a href="http://www.dedebiz.com" title="DedeBiz商业技术支持，提供更专业强大的站点应用开发技术">DedeBIZ <?php echo $cfg_version; ?></a>
-				</div>
+				<div class="login-power"><?php echo $cfg_powerby; ?></div>
 			</form>
 		</div>
 	</main>

src/dede/templets/templets_default.htm

@@ -1,31 +1,21 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 	<title>模板管理器</title>
 	<link rel="stylesheet" href="../static/css/bootstrap.min.css">
-	<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-	<link href="css/base.css" rel="stylesheet" type="text/css" />
-	<style type="text/css">
-		.linerow {
-			border-bottom: 1px solid #CBD8AC;
-		}
-
-		td {
-			padding-left: 5px;
-		}
-
-		a.btn {
-			color: white!important;
-		}
+	<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+	<link rel="stylesheet" href="css/base.css">
+	<style>
+.linerow{border-bottom:1px solid #CBD8AC}
+td{padding-left:6px}
+a.btn{color:white!important}
 	</style>
 	<script language="javascript">
-		function DelTpl(filename) {
-			if (window.confirm('你确定要删除这篇文档吗?')) location = 'tpl.php?action=del&acdir=<?php echo $acdir; ?>&filename=' + filename;
-			else return false;
-		}
+	function DelTpl(filename) {
+		if (window.confirm('你确定要删除这篇文档吗')) location = 'tpl.php?action=del&acdir=<?php echo $acdir; ?>&filename=' + filename;
+		else return false;
+	}
 	</script>
 </head>
 
@@ -48,14 +38,12 @@
 		<tr>
 			<td colspan='4' height="28" bgcolor="#F9FCEF">
 				<div style='float:left'>
-					<b>
-						当前位置：
-						<?php
-      		if($acdir=='plus') echo '插件模板';
-      		else if($acdir=='system') echo '底层模板';
-      		else echo '核心模板 &gt; '.$acdir;
-      		?>
-					</b>
+					当前位置：
+					<?php
+      			if($acdir=='plus') echo '插件模板';
+      			else if($acdir=='system') echo '底层模板';
+      			else echo '核心模板 &gt; '.$acdir;
+      			?>
 				</div>
 				<div style='float:right;padding-right:10px'>
 					<a class="btn btn-success btn-sm" href='templets_main.php'>默认模板目录</a>
@@ -64,51 +52,39 @@
 			</td>
 		</tr>
 		<?php
-   $dh = dir($templetdird);
-   while($filename=$dh->read())
-   {
-   	  if(!preg_match("#\.htm#", $filename)) continue;
-   	  $filetime = filemtime($templetdird.'/'.$filename);
-      $filetime = MyDate("Y-m-d H:i",$filetime);
-      $fileinfo = (isset($fileinfos[$filename]) ? $fileinfos[$filename] : '未知模板');
-   ?>
-		<tr height="26" bgcolor='#FFFFFF' onMouseMove="javascript:this.bgColor='#FCFDEE';"
-			onMouseOut="javascript:this.bgColor='#FFFFFF';">
-			<td>
-				<a href='<?php echo $templeturld.'/'.$filename; ?>' target='_blank'>
-					<img src='images/htm.gif' border='0' align='absmiddle' /> <?php echo $filename; ?>
-				</a>
-			</td>
+		$files = scandir($templetdird);
+		foreach ($files as $filename){
+			if(!preg_match("#\.htm#", $filename))
+			continue;
+			$filetime = filemtime($templetdird.'/'.$filename);
+			$filetime = MyDate("Y-m-d H:i",$filetime);
+			$fileinfo = (isset($fileinfos[$filename]) ? $fileinfos[$filename] : '未知模板');
+		?>
+		<tr height="26" bgcolor='#FFFFFF' onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
 			<td>
-				<?php echo $fileinfo; ?>
-			</td>
-			<td align='center'>
-				<?php echo $filetime; ?>
+				<a href='<?php echo $templeturld.'/'.$filename; ?>' target='_blank'><img src='images/htm.gif' border='0' align='absmiddle' /> <?php echo $filename; ?></a>
 			</td>
+			<td><?php echo $fileinfo; ?></td>
+			<td align='center'><?php echo $filetime; ?></td>
 			<td align='center'>
 				<a class="btn btn-success btn-sm" href='tpl.php?action=edit&acdir=<?php echo $acdir; ?>&filename=<?php echo $filename; ?>' title="编辑"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>
 				<?php
-			if(!isset($fileinfos[$filename]))
-			{
-			?>
+				if(!isset($fileinfos[$filename]))
+				{
+				?>
 				|
 				<a href='#' class="btn btn-success btn-sm" onClick="javascript:DelTpl('<?php echo $filename; ?>');" title="删除"><i class="fa fa-trash" aria-hidden="true"></i></a>
 				<?php
-		   }
-			?>
+		   	}
+				?>
 			</td>
 		</tr>
-		<?php } ?>
+		<?php
+		}
+		?>
 		<tr>
-			<td colspan="4" height='32' bgcolor="#F9FCEF">
-				&nbsp;
-				<a class="btn btn-success" href='tpl.php?action=newfile&acdir=<?php echo $acdir; ?>'>新建模板</a>
-				&nbsp;
-				<a class="btn btn-success" href='tpl.php?action=upload&acdir=<?php echo $acdir; ?>'>上传模板</a>
-			</td>
+			<td colspan="4" height='36' bgcolor="#F9FCEF"><a class="btn btn-success" href='tpl.php?action=newfile&acdir=<?php echo $acdir; ?>'>新建模板</a>&nbsp;<a class="btn btn-success" href='tpl.php?action=upload&acdir=<?php echo $acdir; ?>'>上传模板</a></td>
 		</tr>
 	</table>
-
 </body>
-
 </html>

src/include/common.func.php

@@ -1,5 +1,5 @@
 <?php
-
+if (!defined('DEDEINC')) exit('dedebiz');
 /**
  * 系统核心函数存放文件
  * @version        $Id: common.func.php 4 16:39 2010年7月6日Z tianya $
@@ -8,8 +8,6 @@
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-if (!defined('DEDEINC')) exit('dedebiz');
-
 if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
     if (!function_exists('mysql_connect') and function_exists('mysqli_connect')) {
         function mysql_connect($server, $username, $password)
@@ -17,28 +15,24 @@ if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
             return mysqli_connect($server, $username, $password);
         }
     }
-
     if (!function_exists('mysql_query') and function_exists('mysqli_query')) {
         function mysql_query($query, $link)
         {
             return mysqli_query($link, $query);
         }
     }
-
     if (!function_exists('mysql_select_db') and function_exists('mysqli_select_db')) {
         function mysql_select_db($database_name, $link)
         {
             return mysqli_select_db($link, $database_name);
         }
     }
-
     if (!function_exists('mysql_fetch_array') and function_exists('mysqli_fetch_array')) {
         function mysql_fetch_array($result)
         {
             return mysqli_fetch_array($result);
         }
     }
-
     if (!function_exists('mysql_close') and function_exists('mysqli_close')) {
         function mysql_close($link)
         {
@@ -52,7 +46,6 @@ if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
         }
     }
 }
-
 function make_hash()
 {
     $rand = dede_random_bytes(16);
@@ -61,17 +54,14 @@ function make_hash()
         : bin2hex($rand);
     return $_SESSION['token'];
 }
-
 function dede_random_bytes($length)
 {
     if (empty($length) or !ctype_digit((string) $length)) {
         return FALSE;
     }
-
     if (function_exists('openssl_random_pseudo_bytes')) {
         return openssl_random_pseudo_bytes($length);
     }
-
     if (function_exists('random_bytes')) {
         try {
             return random_bytes((int) $length);
@@ -90,11 +80,8 @@ function dede_random_bytes($length)
             return $output;
         }
     }
-
     return FALSE;
 }
-
-
 /**
  *  载入小助手,系统默认载入小助手
  *  在/data/helper.inc.php中进行默认小助手初始化的设置
@@ -127,7 +114,6 @@ function helper($helpers)
         }
         return;
     }
-
     if (isset($_helpers[$helpers])) {
         return;
     }
@@ -135,12 +121,11 @@ function helper($helpers)
         include_once(DEDEINC . '/helpers/' . $helpers . '.helper.php');
         $_helpers[$helpers] = TRUE;
     }
-    // 无法载入小助手
+    //无法载入小助手
     if (!isset($_helpers[$helpers])) {
         exit('Unable to load the requested file: helpers/' . $helpers . '.helper.php');
     }
 }
-
 function dede_htmlspecialchars($str)
 {
     global $cfg_soft_lang;
@@ -148,7 +133,6 @@ function dede_htmlspecialchars($str)
     if ($cfg_soft_lang == 'gb2312') return htmlspecialchars($str, ENT_COMPAT, 'ISO-8859-1');
     else return htmlspecialchars($str);
 }
-
 /**
  *  载入小助手,这里用户可能载入用helps载入多个小助手
  *
@@ -160,7 +144,6 @@ function helpers($helpers)
 {
     helper($helpers);
 }
-
 //兼容php4的file_put_contents
 if (!function_exists('file_put_contents')) {
     function file_put_contents($n, $d)
@@ -175,7 +158,6 @@ if (!function_exists('file_put_contents')) {
         }
     }
 }
-
 /**
  *  显示更新信息
  *
@@ -186,15 +168,8 @@ function UpdateStat()
     include_once(DEDEINC . "/inc/inc_stat.php");
     return SpUpdateStat();
 }
-
-$arrs1 = array(0x63, 0x66, 0x67, 0x5f, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x62, 0x79);
-$arrs2 = array(
-    0x20, 0x3c, 0x61, 0x20, 0x68, 0x72, 0x65, 0x66, 0x3d, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
-    0x77, 0x77, 0x77, 0x2e, 0x64, 0x65, 0x64, 0x65, 0x63, 0x6d, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x20, 0x74, 0x61, 0x72,
-    0x67, 0x65, 0x74, 0x3d, 0x27, 0x5f, 0x62, 0x6c, 0x61, 0x6e, 0x6b, 0x27, 0x3e, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x20,
-    0x62, 0x79, 0x20, 0x44, 0x65, 0x64, 0x65, 0x43, 0x6d, 0x73, 0x3c, 0x2f, 0x61, 0x3e
-);
-
+$arrs1 = array();
+$arrs2 = array();
 /**
  *  短消息函数,可以在某个动作处理后友好的提示信息
  *
@@ -207,21 +182,16 @@ $arrs2 = array(
 function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
 {
     global $cfg_soft_lang, $cfg_cmsurl;
-    if (empty($GLOBALS['cfg_plus_dir'])) $GLOBALS['cfg_plus_dir'] = '..';
-
-    $htmlhead  = "<html>\r\n<head>\r\n<title>DedeBIZ提示信息</title>\r\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset={$cfg_soft_lang}\" />\r\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">";
-    $htmlhead .= "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/css/bootstrap.min.css\"><style>.modal {position: static;}</style><link href=\"{$cfg_cmsurl}/static/font-awesome/css/font-awesome.min.css\" rel=\"stylesheet\">";
-    $htmlhead .= "<base target='_self'/></head>\r\n<body leftmargin='0' topmargin='0' bgcolor='#FFFFFF'>" . (isset($GLOBALS['ucsynlogin']) ? $GLOBALS['ucsynlogin'] : '') . "\r\n<center>\r\n<script>\r\n";
-    $htmlfoot  = "</script>\r\n</center>\r\n</body>\r\n</html>\r\n";
-
+    if(empty($GLOBALS['cfg_plus_dir'])) $GLOBALS['cfg_plus_dir'] = '..';
+    $htmlhead  = "<html><head><meta charset='utf-8'><title>提示信息</title><meta name='viewport' content='width=device-width,initial-scale=1'>";
+    $htmlhead .= "<base target='_self'></head><body>".(isset($GLOBALS['ucsynlogin']) ? $GLOBALS['ucsynlogin'] : '')."<center><script>";
+    $htmlfoot  = "</script></center></body></html>";
     $litime = ($limittime == 0 ? 1000 : $limittime);
     $func = '';
-
     if ($gourl == '-1') {
         if ($limittime == 0) $litime = 5000;
         $gourl = "javascript:history.go(-1);";
     }
-
     if ($gourl == '' || $onlymsg == 1) {
         $msg = "<script>alert(\"" . str_replace("\"", "“", $msg) . "\");</script>";
     } else {
@@ -231,33 +201,30 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
             $gourl = 'javascript:;';
             $func .= "window.parent.document.getElementById('{$tgobj}').style.display='none';\r\n";
         }
-
-        $func .= "      var pgo=0;
-      function JumpUrl(){
-        if(pgo==0){ location='$gourl'; pgo=1; }
-      }\r\n";
+        $func .= "var pgo=0;function JumpUrl(){if (pgo==0){location='$gourl'; pgo=1;}}";
         $rmsg = $func;
-        $rmsg .= "document.write(\"<main class='container'><div class='modal' tabindex='-1' role='dialog' style='display:block'><div class='modal-dialog'><div class='modal-content'><div class='modal-header'><h6 class='modal-title'>";
-        $rmsg .= "DedeBIZ 提示信息！</h6></div><div class='modal-body'>\");\r\n";
-        $rmsg .= "document.write(\"" . str_replace("\"", "“", $msg) . "\");\r\n";
+        $rmsg .= "document.write(\"<style>body{margin:0;line-height:1.6;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#666;background:#f2f2f2}a{color:#28a745;text-decoration:none}.xushu-tips{margin:68px auto 0;padding:0;width:360px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.tips{margin:0 20px;padding:12px 0;border-bottom:1px solid #f6f6f6}.tips p{margin:0;padding-left:10px;line-height:16px;font-size:14px;color:#424b51;text-align:left;border-left:3px solid #ff5722}.frame{padding:20px;height:120px}.go a{display:inline-block;margin:20px auto 0;padding:.375rem .75rem;color:#fff;background:#28a745;border:1px solid #28a745;box-sizing:border-box;border-radius:.2rem;text-align:center;transition:all .4s}.go a:hover{color:#fff;opacity:.8}@media (max-width:768px){body{padding:0 14px}.xushu-tips{width:100%}}</style>\");";
+        $rmsg .= "document.write(\"<div class='xushu-tips'>";
+        $rmsg .= "<div class='tips'><p>提示信息</p></div>\");";
+        $rmsg .= "document.write(\"<div class='frame'>\");";
+        $rmsg .= "document.write(\"".str_replace("\"","“",$msg)."\");";
         $rmsg .= "document.write(\"";
-
-        if ($onlymsg == 0) {
-            if ($gourl != 'javascript:;' && $gourl != '') {
-                $rmsg .= "<br /><a href='{$gourl}'>如果你的浏览器没反应，请点击这里...</a>";
-                $rmsg .= "</div></div></div></div></main>\");\r\n";
+        if($onlymsg==0)
+        {
+            if( $gourl != 'javascript:;' && $gourl != '')
+            {
+                $rmsg .= "<div class='go'><a href='{$gourl}'>点击反应</a></div>\");";
                 $rmsg .= "setTimeout('JumpUrl()',$litime);";
             } else {
-                $rmsg .= "</div></div></div></div></main>\");\r\n";
+                $rmsg .= "</div>\");";
             }
         } else {
-            $rmsg .= "</div></div></div></div></main>\");\r\n";
+            $rmsg .= "</div>\");";
         }
-        $msg  = $htmlhead . $rmsg . $htmlfoot;
+        $msg  = $htmlhead.$rmsg.$htmlfoot;
     }
     echo $msg;
 }
-
 /**
  *  获取验证码的session值
  *
@@ -269,7 +236,6 @@ function GetCkVdValue()
     @session_start();
     return isset($_SESSION['securimage_code_value']) ? $_SESSION['securimage_code_value'] : '';
 }
-
 /**
  *  PHP某些版本有Bug，不能在同一作用域中同时读session并改注销它，因此调用后需执行本函数
  *
@@ -280,12 +246,10 @@ function ResetVdValue()
     @session_start();
     $_SESSION['securimage_code_value'] = '';
 }
-
 function IndexSub($idx, $num)
 {
     return intval($idx) - intval($num) == 0 ? '0 ' : intval($idx) - intval($num);
 }
-
 // 用来返回index的active
 function IndexActive($idx)
 {
@@ -295,9 +259,8 @@ function IndexActive($idx)
         return '';
     }
 }
-
 // 自定义函数接口
 // 这里主要兼容早期的用户扩展,v5.7之后我们建议使用小助手helper进行扩展
 if (file_exists(DEDEINC . '/extend.func.php')) {
     require_once(DEDEINC . '/extend.func.php');
-}
+}

src/include/taglib/channel.lib.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * 获取栏目列表标签
  *
@@ -9,18 +8,14 @@
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-
-
 function lib_channel(&$ctag, &$refObj)
 {
     global $dsql;
-
     $attlist = "typeid|0,reid|0,row|100,col|1,type|son,currentstyle|,cacheid|";
     FillAttsDefault($ctag->CAttribute->Items, $attlist);
     extract($ctag->CAttribute->Items, EXTR_SKIP);
     $innertext = $ctag->GetInnerText();
     $line = empty($row) ? 100 : $row;
-
     $likeType = '';
     //读取固定的缓存块
     $cacheid = trim($cacheid);
@@ -28,7 +23,6 @@ function lib_channel(&$ctag, &$refObj)
         $likeType = GetCacheBlock($cacheid);
         if ($likeType != '') return $likeType;
     }
-
     $reid = 0;
     $topid = 0;
     //如果属性里没指定栏目id，从引用类里获取栏目信息
@@ -52,39 +46,30 @@ function lib_channel(&$ctag, &$refObj)
             $issetInfos = true;
         }
     }
-
     if ($type == '' || $type == 'sun') $type = 'son';
     if ($innertext == '') $innertext = GetSysTemplets("channel_list.htm");
-
     if ($type == 'top') {
-        $sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl,sitepath
-          From `#@__arctype` WHERE reid=0 And ishidden<>1 order by sortrank asc limit 0, $line ";
+        $sql = "SELECT * From `#@__arctype` WHERE reid=0 And ishidden<>1 order by sortrank asc limit 0, $line ";
     } else if ($type == 'son') {
         if ($typeid == 0) return '';
-        $sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl,sitepath
-          From `#@__arctype` WHERE reid='$typeid' And ishidden<>1 order by sortrank asc limit 0, $line ";
+        $sql = "SELECT * From `#@__arctype` WHERE reid='$typeid' And ishidden<>1 order by sortrank asc limit 0, $line ";
     } else if ($type == 'self') {
         if ($reid == 0) return '';
-        $sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl,sitepath
-            FROM `#@__arctype` WHERE reid='$reid' And ishidden<>1 order by sortrank asc limit 0, $line ";
+        $sql = "SELECT * FROM `#@__arctype` WHERE reid='$reid' And ishidden<>1 order by sortrank asc limit 0, $line ";
     }
-    //And id<>'$typeid'
     $needRel = false;
     $dtp2 = new DedeTagParse();
     $dtp2->SetNameSpace('field', '[', ']');
     $dtp2->LoadSource($innertext);
     //检查是否有子栏目，并返回rel提示（用于二级菜单）
     if (preg_match('#:rel#', $innertext)) $needRel = true;
-
     if (empty($sql)) return '';
     $dsql->SetQuery($sql);
     $dsql->Execute();
-
     $totalRow = $dsql->GetTotalRow();
     //如果用子栏目模式，当没有子栏目时显示同级栏目
     if ($type == 'son' && $reid != 0 && $totalRow == 0) {
-        $sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl,sitepath
-            FROM `#@__arctype` WHERE reid='$reid' And ishidden<>1 order by sortrank asc limit 0, $line ";
+        $sql = "SELECT * FROM `#@__arctype` WHERE reid='$reid' And ishidden<>1 order by sortrank asc limit 0, $line ";
         $dsql->SetQuery($sql);
         $dsql->Execute();
     }
@@ -121,17 +106,15 @@ function lib_channel(&$ctag, &$refObj)
             }
             if ($col > 1) $likeType .= "</dd>\r\n";
             $GLOBALS['autoindex']++;
-        }
-        //Loop Col
+        }//Loop Col
         if ($col > 1) {
             $i += $col - 1;
             $likeType .= "    </dl>\r\n";
         }
-    }
-    //Loop for $i
+    }//Loop for $i
     $dsql->FreeResult();
     if ($cacheid != '') {
         WriteCacheBlock($cacheid, $likeType);
     }
     return $likeType;
-}
+}

src/include/taglib/channelartlist.lib.php

@@ -1,4 +1,5 @@
-<?php if (!defined('DEDEINC')) exit('Request Error!');
+<?php
+if (!defined('DEDEINC')) exit('Request Error!');
 /**
  * 获取当前频道的下级栏目的内容列表标签
  *
@@ -8,13 +9,10 @@
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-
 require_once(DEDEINC . '/arc.partview.class.php');
-
 function lib_channelartlist(&$ctag, &$refObj)
 {
     global $dsql, $envs, $_sys_globals;
-
     //处理标记属性、innertext
     $attlist = 'typeid|0,row|20,cacheid|';
     FillAttsDefault($ctag->CAttribute->Items, $attlist);
@@ -27,15 +25,12 @@ function lib_channelartlist(&$ctag, &$refObj)
         $artlist = GetCacheBlock($cacheid);
         if ($artlist != '') return $artlist;
     }
-
     if (empty($typeid)) {
         $typeid = (!empty($refObj->TypeLink->TypeInfos['id']) ?  $refObj->TypeLink->TypeInfos['id'] : 0);
     }
-
     if ($innertext == '') $innertext = GetSysTemplets('part_channelartlist.htm');
     $totalnum = $row;
     if (empty($totalnum)) $totalnum = 20;
-
     //获得类别ID总数的信息
     $typeids = array();
     if ($typeid == 0 || $typeid == 'top') {
@@ -47,21 +42,25 @@ function lib_channelartlist(&$ctag, &$refObj)
             $tpsql = " id IN($typeid) AND ispart<>2 AND ishidden<>1 ";
         }
     }
-    $dsql->SetQuery("SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl,sitepath 
-                                            FROM `#@__arctype` WHERE $tpsql ORDER BY sortrank ASC LIMIT $totalnum");
+    $dsql->SetQuery("SELECT * FROM `#@__arctype` WHERE $tpsql ORDER BY sortrank ASC LIMIT $totalnum");
     $dsql->Execute();
     while ($row = $dsql->GetArray()) {
         $typeids[] = $row;
     }
-
     if (!isset($typeids[0])) return '';
-
     $GLOBALS['itemindex'] = 0;
     $GLOBALS['itemparity'] = 1;
     for ($i = 0; isset($typeids[$i]); $i++) {
         $GLOBALS['itemindex']++;
         $pv = new PartView($typeids[$i]['id']);
         $pv->Fields['typeurl'] = GetOneTypeUrlA($typeids[$i]);
+        //栏目高亮
+		if($typeids[$i]['id'] == $refObj->TypeLink->TypeInfos['id'] || $typeids[$i]['id'] == $refObj->TypeLink->TypeInfos['reid'] || $typeids[$i]['id'] == $refObj->TypeLink->TypeInfos['topid'] || $typeids[$i]['id'] == GetTopid($refObj->TypeLink->TypeInfos['id']) )
+		{
+			$pv->Fields['currentstyle'] = $currentstyle ? $currentstyle : 'current';
+		} else {
+			$pv->Fields['currentstyle'] = '';
+		}
         $pv->SetTemplet($innertext, 'string');
         $artlist .= $pv->GetResult();
         $GLOBALS['itemparity'] = ($GLOBALS['itemparity'] == 1 ? 2 : 1);
@@ -73,4 +72,4 @@ function lib_channelartlist(&$ctag, &$refObj)
         WriteCacheBlock($cacheid, $artlist);
     }
     return $artlist;
-}
+}

src/include/taglib/type.lib.php

@@ -1,4 +1,5 @@
-<?php if (!defined('DEDEINC')) exit('Request Error!');
+<?php
+if (!defined('DEDEINC')) exit('Request Error!');
 /**
  * 指定的单个栏目的链接标签
  *
@@ -8,27 +9,20 @@
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-
 function lib_type(&$ctag, &$refObj)
 {
     global $dsql, $envs;
-
     $attlist = 'typeid|0';
     FillAttsDefault($ctag->CAttribute->Items, $attlist);
     extract($ctag->CAttribute->Items, EXTR_SKIP);
     $innertext = trim($ctag->GetInnerText());
-
     if ($typeid == 0) {
         $typeid = (isset($refObj->TypeLink->TypeInfos['id']) ? $refObj->TypeLink->TypeInfos['id'] : $envs['typeid']);
     }
-
     if (empty($typeid)) return '';
-
-    $row = $dsql->GetOne("SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl,sitepath 
-                          FROM `#@__arctype` WHERE id='$typeid' ");
+    $row = $dsql->GetOne("SELECT * FROM `#@__arctype` WHERE id='$typeid' ");
     if (!is_array($row)) return '';
     if (trim($innertext) == '') $innertext = GetSysTemplets("part_type_list.htm");
-
     $dtp = new DedeTagParse();
     $dtp->SetNameSpace('field', '[', ']');
     $dtp->LoadSource($innertext);
@@ -44,4 +38,4 @@ function lib_type(&$ctag, &$refObj)
         unset($dtp);
         return $revalue;
     }
-}
+}

src/static/ckeditor/contents.css

@@ -1,208 +1,29 @@
-/*
-Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
-*/
-
-body
-{
-	/* Font */
-	/* Emoji fonts are added to visualise them nicely in Internet Explorer. */
-	font-family: sans-serif, Arial, Verdana, "Trebuchet MS", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-	font-size: 12px;
-
-	/* Text color */
-	color: #333;
-
-	/* Remove the background color to make it transparent. */
-	background-color: #fff;
-
-	margin: 20px;
-}
-
-.cke_editable
-{
-	font-size: 13px;
-	line-height: 1.6;
-
-	/* Fix for missing scrollbars with RTL texts. (#10488) */
-	word-wrap: break-word;
-}
-
-blockquote
-{
-	font-style: italic;
-	font-family: Georgia, Times, "Times New Roman", serif;
-	padding: 2px 0;
-	border-style: solid;
-	border-color: #ccc;
-	border-width: 0;
-}
-
-.cke_contents_ltr blockquote
-{
-	padding-left: 20px;
-	padding-right: 8px;
-	border-left-width: 5px;
-}
-
-.cke_contents_rtl blockquote
-{
-	padding-left: 8px;
-	padding-right: 20px;
-	border-right-width: 5px;
-}
-
-a
-{
-	color: #0782C1;
-}
-
-ol,ul,dl
-{
-	/* IE7: reset rtl list margin. (#7334) */
-	*margin-right: 0px;
-	/* Preserved spaces for list items with text direction different than the list. (#6249,#8049)*/
-	padding: 0 40px;
-}
-
-h1,h2,h3,h4,h5,h6
-{
-	font-weight: normal;
-	line-height: 1.2;
-}
-
-hr
-{
-	border: 0px;
-	border-top: 1px solid #ccc;
-}
-
-img.right
-{
-	border: 1px solid #ccc;
-	float: right;
-	margin-left: 15px;
-	padding: 5px;
-}
-
-img.left
-{
-	border: 1px solid #ccc;
-	float: left;
-	margin-right: 15px;
-	padding: 5px;
-}
-
-pre
-{
-	white-space: pre-wrap; /* CSS 2.1 */
-	word-wrap: break-word; /* IE7 */
-	-moz-tab-size: 4;
-	tab-size: 4;
-}
-
-.marker
-{
-	background-color: Yellow;
-}
-
-span[lang]
-{
-	font-style: italic;
-}
-
-figure
-{
-	text-align: center;
-	outline: solid 1px #ccc;
-	background: rgba(0,0,0,0.05);
-	padding: 10px;
-	margin: 10px 20px;
-	display: inline-block;
-}
-
-figure > figcaption
-{
-	text-align: center;
-	display: block; /* For IE8 */
-}
-
-a > img {
-	padding: 1px;
-	margin: 1px;
-	border: none;
-	outline: 1px solid #0782C1;
-}
-
-/* Widget Styles */
-.code-featured
-{
-	border: 5px solid red;
-}
-
-.math-featured
-{
-	padding: 20px;
-	box-shadow: 0 0 2px rgba(200, 0, 0, 1);
-	background-color: rgba(255, 0, 0, 0.05);
-	margin: 10px;
-}
-
-.image-clean
-{
-	border: 0;
-	background: none;
-	padding: 0;
-}
-
-.image-clean > figcaption
-{
-	font-size: .9em;
-	text-align: right;
-}
-
-.image-grayscale
-{
-	background-color: white;
-	color: #666;
-}
-
-.image-grayscale img, img.image-grayscale
-{
-	filter: grayscale(100%);
-}
-
-.embed-240p
-{
-	max-width: 426px;
-	max-height: 240px;
-	margin:0 auto;
-}
-
-.embed-360p
-{
-	max-width: 640px;
-	max-height: 360px;
-	margin:0 auto;
-}
-
-.embed-480p
-{
-	max-width: 854px;
-	max-height: 480px;
-	margin:0 auto;
-}
-
-.embed-720p
-{
-	max-width: 1280px;
-	max-height: 720px;
-	margin:0 auto;
-}
-
-.embed-1080p
-{
-	max-width: 1920px;
-	max-height: 1080px;
-	margin:0 auto;
-}
+body{font-family:sans-serif,Arial,Verdana,"Trebuchet MS","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:12px;color:#333;background-color:#fff;margin:20px}
+blockquote{font-style:italic;font-family:Georgia,Times,"Times New Roman",serif;padding:2px 0;border-style:solid;border-color:#ccc;border-width:0}
+a{color:#0782C1}
+ol,ul,dl{padding:0 40px}
+h1,h2,h3,h4,h5,h6{font-weight:normal;line-height:1.5}
+hr{border:0px;border-top:1px solid #ccc}
+pre{white-space:pre-wrap;word-wrap:break-word;-moz-tab-size:4;tab-size:4}
+span[lang]{font-style:italic}
+figure{text-align:center;outline:solid 1px #ccc;background:rgba(0,0,0,0.05);padding:10px;margin:10px 20px;display:inline-block}
+figure > figcaption{text-align:center;display:block}
+img{border-radius:6px}
+a > img{padding:1px;margin:1px;border:none;outline:1px solid #0782C1}
+img.right{border:1px solid #ccc;float:right;margin-left:15px;padding:5px}
+img.left{border:1px solid #ccc;float:left;margin-right:15px;padding:5px}
+.marker{background-color:Yellow}
+.cke_editable{font-size:12px;line-height:1.5;word-wrap:break-word}
+.cke_contents_ltr blockquote{padding-left:20px;padding-right:8px;border-left-width:5px}
+.cke_contents_rtl blockquote{padding-left:8px;padding-right:20px;border-right-width:5px}
+.code-featured{border:5px solid red}
+.math-featured{padding:20px;box-shadow:0 0 2px rgba(200,0,0,1);background-color:rgba(255,0,0,0.05);margin:10px}
+.image-clean{border:0;background:none;padding:0}
+.image-clean > figcaption{font-size:.9em;text-align:right}
+.image-grayscale{background-color:white;color:#666}
+.image-grayscale img,img.image-grayscale{filter:grayscale(100%)}
+.embed-240p{max-width:426px;max-height:240px;margin:0 auto}
+.embed-360p{max-width:640px;max-height:360px;margin:0 auto}
+.embed-480p{max-width:854px;max-height:480px;margin:0 auto}
+.embed-720p{max-width:1280px;max-height:720px;margin:0 auto}
+.embed-1080p{max-width:1920px;max-height:1080px;margin:0 auto}