README.md

@@ -1,10 +1,10 @@
-# DedeCMSV6
+# DedeBIZ
 
-国内流行的内容管理系统（CMS）多端全媒体解决方案，DedeCMSV6系统基于PHP7.X开发，具有很强的可扩展性，并且完全开放源代码。DedeBIZ商业支持采用现流行的Go语言设计开发，让DedeCMS系统拥有简单易用、灵活扩展特性之外更安全、高效。模板设计制作简单一直是系统的一大特点，全新的版本延续了之前标签引擎，同时采用响应式模板引擎Bootstrap作为系统模板渲染引擎，让搭建跨终端（移动、PC）全媒体站点更简单。
+国内流行的内容管理系统（CMS）多端全媒体解决方案，DedeBIZ系统基于PHP7.X开发，具有很强的可扩展性，并且完全开放源代码。DedeBIZ商业支持采用现流行的Go语言设计开发，让DedeCMS系统拥有简单易用、灵活扩展特性之外更安全、高效。模板设计制作简单一直是系统的一大特点，全新的版本延续了之前标签引擎，同时采用响应式模板引擎Bootstrap作为系统模板渲染引擎，让搭建跨终端（移动、PC）全媒体站点更简单。
 
 ## 版本说明
 
-DedeCMSV6.x是一个LTS版本，支持将到2022年10月截止，目前DedeCMSV6已经发布，可以[点击下载](https://www.dedebiz.com/download)获取。
+DedeBIZ.x是一个LTS版本，支持将到2022年10月截止，目前DedeBIZ已经发布，可以[点击下载](https://www.dedebiz.com/download)获取。
 
 ## 参与开源
 
@@ -14,7 +14,7 @@ DedeCMSV6.x是一个LTS版本，支持将到2022年10月截止，目前DedeCMSV6
 
 我们将会收集、整理新的功能需求制定新的Roadmap。
 
-[开发者](https://www.dedebiz.com/developer)可以到[工单管理](https://www.zhelixie.com/DedeBiz/DedeCMSV6/issues)中进行交流反馈。
+[开发者](https://www.dedebiz.com/developer)可以到[工单管理](https://www.zhelixie.com/DedeBiz/DedeBIZ/issues)中进行交流反馈。
 
 普通用户可以通过微信公众号或者邮件的方式进行反馈，详见本页底部资源。
 
@@ -95,8 +95,8 @@ NAME:
 USAGE:
 	php ./dedebiz command [arguments...]
 COMMANDS:
-	serv,s Run cli web server for DedeCMSV6
-	make,m Make DedeCMSV6 HTML
+	serv,s Run cli web server for DedeBIZ
+	make,m Make DedeBIZ HTML
 	update,u Update to latest system
 	help,h Shows a list of commands or help
 	quick,q Quick start a development environment
@@ -112,13 +112,13 @@ WEBSITE:
 
 ## 版权信息
 
-详细参考：[DedeCMSV6站点授权协议](https://www.dedebiz.com/license)
+详细参考：[DedeBIZ站点授权协议](https://www.dedebiz.com/license)
 
-我们对DedeCMSV6系统授权的态度是“鼓励但不强制”，购买授权是对知识产权的尊重，是对我们技术服务的认可。
+我们对DedeBIZ系统授权的态度是“鼓励但不强制”，购买授权是对知识产权的尊重，是对我们技术服务的认可。
 
 ## 相关资源
 
-- [DedeCMSV6](https://www.dedebiz.com)
+- [DedeBIZ](https://www.dedebiz.com)
 
 - [帮助中心](https://www.dedebiz.com/help)
 

dedebiz

@@ -14,7 +14,7 @@ $workDir = dirname(__FILE__) . "/src";
 chdir($workDir);
 
 if (substr(php_sapi_name(), 0, 3) === 'cgi') {
-	die("DedeCMSV6:needs php-cli to run\n\n");
+	die("DedeBIZ:needs php-cli to run\n\n");
 }
 
 $helpStr = "
@@ -23,8 +23,8 @@ NAME:
 USAGE:
 	php ./dedebiz command [arguments...]
 COMMANDS:
-	serv,s Run cli web server for DedeCMSV6
-	make,m Make DedeCMSV6 HTML
+	serv,s Run cli web server for DedeBIZ
+	make,m Make DedeBIZ HTML
 	update,u Update to latest system
 	help,h Shows a list of commands or help
 	quick,q Quick start a development environment
@@ -75,9 +75,9 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 	// PHP5.4以下不支持内建服务器
 	// 用于开发调试
 	if (phpversion() < "5.4") {
-		die("DedeCMSV6:command web server not support\n\n");
+		die("DedeBIZ:command web server not support\n\n");
 	}
-	echo "Start Dev Server For DedeCMSV6\n\r";
+	echo "Start Dev Server For DedeBIZ\n\r";
 	echo "Open http://localhost:8088\n\r";
 	passthru(PHP_BINARY . ' -S localhost:8088 -t' . escapeshellarg('./'));
 } else if (count($argv) > 1 && ($argv[1] == "make" || $argv[1] == "m")) {
@@ -296,23 +296,23 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 } else if (count($argv) > 1 && ($argv[1] == "quick" || $argv[1] == "q")){
 	define("DEDEINC", $workDir."/include");
 	require_once(DEDEINC . "/cli.class.php");
-	// 快速开始一个用于开发的DedeCMSV6环境，基于SQLite无其他依赖
-	if (file_exists($workDir."/data/dedecmsv6.db")) {
+	// 快速开始一个用于开发的DedeBIZ环境，基于SQLite无其他依赖
+	if (file_exists($workDir."/data/DedeBIZ.db")) {
 		DedeCli::write("development environment has inited");
-		echo "Start Dev Server For DedeCMSV6\n\r";
+		echo "Start Dev Server For DedeBIZ\n\r";
 		echo "Open http://localhost:8088\n\r";
 		passthru(PHP_BINARY . ' -S localhost:8088 -t' . escapeshellarg('./'));
 		exit;
 	}
 	// 初始化安装一个开发环境
-	$db = new SQLite3($workDir.'/data/dedecmsv6.db');
+	$db = new SQLite3($workDir.'/data/DedeBIZ.db');
 	$fp = fopen($workDir."/install/common.inc.php","r");
     $configStr1 = fread($fp,filesize($workDir."/install/common.inc.php"));
     fclose($fp);
     @chmod($workDir."/data",0777);
     $dbtype = "sqlite";
     $dbhost = "";
-    $dbname = "dedecmsv6";
+    $dbname = "DedeBIZ";
     $dbuser = "";
     $dbpwd = "";
     $dbprefix = "dede_";
@@ -334,7 +334,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
     $baseurl = "http://127.0.0.1:8088";
     $indexUrl = "/";
     $cmspath = "";
-    $webname = "DedeCMSV6本地测试开发站点";
+    $webname = "DedeBIZ本地测试开发站点";
     $adminmail = "admin@dedebiz.com";
 
     $fp = fopen($workDir."/install/config.cache.inc.php","r");
@@ -459,9 +459,9 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
                 Values('1','10','0','{$adminuser}的空间','','person','',''); ";
     $db->exec($adminquery);
 	if (phpversion() < "5.4") {
-		die("DedeCMSV6:command web server not support\n\n");
+		die("DedeBIZ:command web server not support\n\n");
 	}
-	echo "Start Dev Server For DedeCMSV6\n\r";
+	echo "Start Dev Server For DedeBIZ\n\r";
 	echo "Open http://localhost:8088\n\r";
 	passthru(PHP_BINARY . ' -S localhost:8088 -t' . escapeshellarg('./'));
 	exit;

src/dede/css/indexbody.css

@@ -1,205 +1 @@
-td {
-    padding: 3px 0px 0 3px;
-}
-
-.title {
-    color: #666600;
-    font-weight: bold;
-}
-
-.title span {
-    padding-left: 3px;
-}
-
-#addTab {
-    position: absolute;
-    left: 455px;
-    top: 150px;
-    width: 360px;
-    height: 200px;
-    z-index: 2;
-    background-color: #FFFFFF;
-    border: 1px solid #889D8F;
-    padding: 0px;
-    display: none;
-    overflow: hidden;
-}
-
-#editTab {
-    position: absolute;
-    left: 455px;
-    top: 120px;
-    width: 360px;
-    height: 350px;
-    z-index: 1;
-    background-color: #FFFFFF;
-    border: 1px solid #889D8F;
-    padding: 0px;
-    display: none;
-}
-
-.txt {
-    float: left;
-}
-
-.updatedvt {
-    line-height: 23px;
-    padding-left: 3px;
-    width: 98%;
-    border-bottom: 1px dashed #dcdcdc;
-}
-
-.upinfotitle {
-    border-bottom: 1px solid #cccccc;
-    color: red;
-    font-weight: bold;
-    line-height: 26px;
-}
-
-.verline {
-    border-bottom: 1px dashed #cccccc;
-    line-height: 26px;
-}
-
-.itemTable {
-    margin-top: 8px;
-    background: #CBD8AC;
-}
-
-#loaddiv {
-    top: 0;
-    left: 0;
-    background: #cccccc;
-    filter: Alpha(opacity=70);
-    -moz-opacity: 0.7;
-    position: absolute;
-    z-index: 10000;
-    width: 100%;
-    height: 100%;
-}
-
-#mainmsg {
-    padding-right: 8px;
-}
-
-.rightside {
-    width: 49%;
-    float: left;
-    margin-right: 1%;
-    height: 670px;
-    scrollbar-face-color: #ffffff;
-    scrollbar-highlight-color: #919192;
-    scrollbar-shadow-color: #919192;
-    scrollbar-3dlight-color: #ffffff;
-    scrollbar-arrow-color: #919192;
-    scrollbar-track-color: #ffffff;
-    scrollbar-darkshadow-color: #ffffff;
-}
-
-.column {
-    width: 49%;
-    float: left;
-    margin-right: 0.5%;
-}
-
-.placeholder {
-    width: 98%;
-    margin-left: 1%;
-    background: #f0f0f0;
-    border: 1px dashed #ddd;
-}
-
-.dbox {
-    border: 1px solid #DEEAB6;
-    width: 98%;
-    margin-left: 1%;
-    margin-top: 8px;
-}
-
-.dbox dt {
-    height: 28px;
-    line-height: 28px;
-    font-weight: bold;
-    color: #4D6C2F;
-    cursor: move;
-}
-
-.dbox dt .l {
-    float: left;
-    padding-left: 8px;
-}
-
-.dbox dt .r {
-    float: right;
-    padding-right: 8px;
-}
-
-.dbox dt.lside {
-    border-bottom: 1px solid #CFD7C4;
-    background-color: rgb(239, 248, 229);
-}
-
-.dbox dt.rside {
-    border-bottom: 1px solid #DEEAB6;
-    background: url(../images/wbg.gif) repeat-x;
-}
-
-.dbox dd {
-    padding: 0px;
-}
-
-.dbox dd.intable {
-    padding-top: 3px;
-}
-
-#updatetest {
-    padding: 6px;
-    padding-left: 110px;
-    background: url("../images/ico_spider.gif") no-repeat scroll 10px 15px transparent;
-}
-
-#quickmenu {
-    width: 100%;
-    height: 46px;
-    overflow: hidden;
-}
-
-#quickmenu .icoitem {
-    float: left;
-    height: 24px;
-    line-height: 24px;
-    margin-top: 12px;
-    padding-left: 30px;
-    overflow: hidden;
-}
-
-.dboxtable td.nline {
-    border-bottom: 1px dashed #CFD7C4;
-    height: 26px;
-}
-
-.dboxtable1 ul li {
-    float: left;
-    border-bottom: 1px dashed #CFD7C4;
-    height: 26px;
-    line-height: 26px;
-    display: inline;
-    width: 48%;
-    text-align: center;
-}
-
-.biz p {
-    padding: 0 15px;
-    line-height: 23px;
-}
-
-.biz img {
-    float: right;
-    margin: 40px 15px 0 15px;
-}
-
-.footer {
-    line-height: 36px;
-    margin-top: 8px;
-    font-family: Verdana, Geneva, sans-serif;
-}
+.title{color:#666600;font-weight:bold}.title span{padding-left:3px}#addTab{position:absolute;left:455px;top:150px;width:360px;height:200px;z-index:2;background-color:#FFFFFF;border:1px solid #889D8F;padding:0px;display:none;overflow:hidden}#editTab{position:absolute;left:455px;top:120px;width:360px;height:350px;z-index:1;background-color:#FFFFFF;border:1px solid #889D8F;padding:0px;display:none}.txt{float:left}.updatedvt{width:98%;border-bottom:1px dashed #dcdcdc}.upinfotitle{border-bottom:1px solid #cccccc;color:red;font-weight:bold}.verline{border-bottom:1px dashed #cccccc}.itemTable{background:#CBD8AC}#loaddiv{top:0;left:0;background:#cccccc;filter:Alpha(opacity=70);-moz-opacity:0.7;position:absolute;z-index:10000;width:100%;height:100%}#mainmsg{padding-right:8px}.rightside{width:49%;float:left;margin-right:1%;height:670px}.column{width:49%;float:left;margin-right:0.5%}.placeholder{width:98%;margin-left:1%;background:#f0f0f0;border:1px dashed #ddd}.dbox{border:1px solid #DEEAB6;width:98%;margin-left:1%;margin-top:8px}.dbox dt{height:28px;line-height:28px;font-weight:bold;color:#4D6C2F;cursor:move}.dbox dt .l{float:left;padding-left:8px}.dbox dt .r{float:right;padding-right:8px}.dbox dt.lside{border-bottom:1px solid #CFD7C4;background-color:rgb(239,248,229)}.dbox dt.rside{border-bottom:1px solid #DEEAB6;background:url(../images/wbg.gif) repeat-x}.dbox dd{padding:0px}.dbox dd.intable{padding-top:0}#updatetest{padding:6px;padding-left:110px;background:url(../images/ico_spider.gif) no-repeat scroll 10px 15px transparent}#quickmenu{width:100%;height:46px;overflow:hidden}#quickmenu .icoitem{float:left;height:24px;line-height:24px;margin-top:10px;padding-left:30px;overflow:hidden}.dboxtable td.nline{border-bottom:1px dashed #CFD7C4;height:26px}.dboxtable1 ul li{float:left;border-bottom:1px dashed #CFD7C4;height:26px;line-height:26px;display:inline;width:48%;text-align:center}.biz p{padding:0 15px}.biz img{float:right;margin:40px 15px 0 15px}

src/dede/dialog/select_images.php

@@ -55,10 +55,10 @@ if (!empty($noeditor)) {
     <link rel="stylesheet" href="../css/base.css">
     <style>
 html{background:#f2f2f2}
-body{margin:0;line-height:22px;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
+body{margin:0;line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
 a{text-decoration:none!important}
 table{background:#fff}
-.bg{margin:10px;border-radius:2px;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
+.bg{margin:10px;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
 .linerow{border-bottom:1px solid #eee!important}
 .napisdiv{left:40;top:10;width:150px;height:100px;position:absolute;z-index:3;display:none}
     </style>
@@ -73,7 +73,7 @@ table{background:#fff}
 </head>
 <body class="bg">
     <div id="floater" class="napisdiv">
-        <a href="javascript:nullLink();" onClick="document.getElementById('floater').style.display='none';"><img src='img/picviewnone.gif' id='picview' border='0' alt='关闭预览'></a>
+        <a href="javascript:nullLink();" onClick="document.getElementById('floater').style.display='none';"><img src="img/picviewnone.gif" id='picview' alt="关闭预览"></a>
     </div>
     <script src="../js/float.js"></script>
     <script>
@@ -221,7 +221,7 @@ table{background:#fff}
                                     <input type="hidden" name="job" value="upload">
                                     <tr>
                                         <td>
-                                            上传：<input type="file" name="imgfile" style="width:160px">
+                                            上传：<input type="file" name="imgfile" style="width:160px;border:none">
                                             <label><input type="checkbox" name="needwatermark" value="1" class="np" <?php if ($photo_markup == '1') echo "checked"; ?> /> 水印 </label>
                                             <label><input type="checkbox" name="resize" value="1" class="np"> 缩小 </label>
                                             宽：<input type="text" name="iwidth" value="<?php echo $cfg_ddimg_width ?>" style="width:46px">

src/dede/dialog/select_soft.php

@@ -48,10 +48,10 @@ if (!empty($noeditor)) {
     <link rel="stylesheet" href="../css/base.css">
     <style>
 html{background:#f2f2f2}
-body{margin:0;line-height:22px;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
+body{margin:0;line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
 a{text-decoration:none!important}
 table{background:#fff}
-.bg{margin:10px;border-radius:2px;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
+.bg{margin:10px;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
 .linerow{border-bottom:1px solid #eee!important}
     </style>
 </head>
@@ -82,7 +82,7 @@ table{background:#fff}
                     <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
                     <input type="hidden" name="f" value="<?php echo $f ?>">
                     <input type="hidden" name="job" value="upload">
-                    &nbsp;上传：<input type="file" name="uploadfile" size="24">
+                    &nbsp;上传：<input type="file" name="uploadfile" size="24" style="border:none">
                     &nbsp;
                     改名：<input type="text" name="newname" style="width:160px">
                     &nbsp;
@@ -128,7 +128,7 @@ table{background:#fff}
                             </tr>\r\n";
                             echo $line;
                         } else if (is_dir("$inpath/$file")) {
-                            if (preg_match("#^_(.*)$#i", $file)) continue; #屏蔽FrontPage扩展目录和linux隐蔽目录
+                            if (preg_match("#^_(.*)$#i", $file)) continue;
                             if (preg_match("#^\.(.*)$#i", $file)) continue;
                             $line = "\n<tr height='28'>
                             <td class='linerow'><a href=select_soft.php?f=$f&activepath=" . urlencode("$activepath/$file") . $addparm . "><img src='img/dir.gif'>$file</a></td>
@@ -168,7 +168,7 @@ table{background:#fff}
             </td>
         </tr>
         <tr>
-            <td colspan="3" height="30">请点击要选择的文件，红色字样的为刚上传的文件</td>
+            <td colspan="3" height="30">点击选择的文件，红色字样的为刚上传的文件</td>
         </tr>
     </table>
 </body>

src/dede/dialog/select_templets.php

@@ -40,10 +40,10 @@ if (empty($comeback)) {
     <link rel="stylesheet" href="../css/base.css">
     <style>
 html{background:#f2f2f2}
-body{margin:0;line-height:22px;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
+body{margin:0;line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
 a{text-decoration:none!important}
 table{background:#fff}
-.bg{margin:10px;border-radius:2px;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
+.bg{margin:10px;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
 .linerow{border-bottom:1px solid #eee!important}
     </style>
 </head>
@@ -183,11 +183,11 @@ table{background:#fff}
                     <table width="100%">
                         <form action="select_templets_post.php" method="POST" enctype="multipart/form-data" name="myform">
                         <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
-                        <input type="hidden" name="f" value='<?php echo $f ?>'>
+                        <input type="hidden" name="f" value="<?php echo $f ?>">
                         <input type="hidden" name="job" value="upload">
                             <tr>
                                 <td>
-                                    &nbsp;上传：<input type="file" name="uploadfile" style="width:260px">
+                                    上传：<input type="file" name="uploadfile" style="width:260px;border:none">
                                     改名：<input type="text" name="filename" style="width:160px">
                                     <button type="submit" name="sb1" class="btn btn-success btn-sm">确定</button>
                                 </td>

src/dede/inc/inc_action_info.php

@@ -443,7 +443,7 @@ $actionSearch[10] = array(
         ),
         14  =>  array(
             'title' => '病毒扫描[S]',
-            'description' => '以DedeCMSV6开发模式为标准对现有的文件进行扫描并进行判断',
+            'description' => '以DedeBIZ开发模式为标准对现有的文件进行扫描并进行判断',
             'purview' => 'sys_verifies',
             'linkurl' => 'sys_safetest.php'
         ),

src/dede/login.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * 后台登录
  *
@@ -13,9 +12,7 @@ require_once(dirname(__FILE__) . '/../include/common.inc.php');
 require_once(DEDEINC . '/userlogin.class.php');
 if (empty($dopost)) $dopost = '';
 if (empty($gotopage)) $gotopage = '';
-
 $gotopage = RemoveXSS($gotopage);
-
 //检测安装目录安全性
 if (is_dir(dirname(__FILE__) . '/../install')) {
     if (!file_exists(dirname(__FILE__) . '/../install/install_lock.txt')) {
@@ -37,18 +34,15 @@ if (is_dir(dirname(__FILE__) . '/../install')) {
         fclose($fp);
     }
 }
-
 //更新服务器
 require_once(DEDEDATA . '/admin/config_update.php');
-
 //检测后台目录是否更名
 $cururl = GetCurUrl();
 if (preg_match('/dede\/login/i', $cururl)) {
-    $redmsg = '<div class=\'safe-tips\'>您的管理目录的名称中包含默认名称dede，建议在FTP里把它修改为其它名称，那样会更安全！</div>';
+    $redmsg = '<div class="alert alert-warning" role="alert"><div class=\"safe-tips\">您的管理目录的名称中包含默认名称dede，建议在FTP里把它修改为其它名称，那样会更安全！</div></div>';
 } else {
     $redmsg = '';
 }
-
 //登录检测
 $admindirs = explode('/', str_replace("\\", '/', dirname(__FILE__)));
 $admindir = $admindirs[count($admindirs) - 1];
@@ -57,44 +51,40 @@ if ($dopost == 'login') {
     $svali = strtolower(GetCkVdValue());
     if (($validate == '' || $validate != $svali) && preg_match("/6/", $safe_gdopen)) {
         ResetVdValue();
-        ShowMsg('验证码不正确!', 'login.php', 0, 1000);
+        ShowMsg('验证码不正确', 'login.php', 0, 1000);
         exit;
     } else {
         $cuserLogin = new userLogin($admindir);
         if (!empty($userid) && !empty($pwd)) {
             $res = $cuserLogin->checkUser($userid, $pwd);
-
             //success
             if ($res == 1) {
                 $cuserLogin->keepUser();
                 if (!empty($gotopage)) {
-                    ShowMsg('成功登录，正在转向管理管理主页！', $gotopage);
+                    ShowMsg('成功登录，正在转向管理管理主页', $gotopage);
                     exit();
                 } else {
-                    ShowMsg('成功登录，正在转向管理管理主页！', "index.php");
+                    ShowMsg('成功登录，正在转向管理管理主页', "index.php");
                     exit();
                 }
             }
-
             //error
             else if ($res == -1) {
                 ResetVdValue();
-                ShowMsg('你的用户名不存在!', 'login.php', 0, 1000);
+                ShowMsg('你的用户名不存在', 'login.php', 0, 1000);
                 exit;
             } else {
                 ResetVdValue();
-                ShowMsg('你的密码错误!', 'login.php', 0, 1000);
+                ShowMsg('你的密码错误', 'login.php', 0, 1000);
                 exit;
             }
         }
-
         //password empty
         else {
             ResetVdValue();
-            ShowMsg('用户和密码没填写完整!', 'login.php', 0, 1000);
+            ShowMsg('用户和密码没填写完整', 'login.php', 0, 1000);
             exit;
         }
     }
 }
-
 include('templets/login.htm');

src/dede/templets/article_add.htm

@@ -1,142 +1,106 @@
-<!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">
-
+<!DOCTYPE html>
+<html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <meta charset="<?php echo $cfg_soft_lang; ?>">
   <title>增加文章</title>
-  <style type="text/css">
-    body {
-      background-image: url(images/allbg.gif);
-    }
-
-    .multipic {
-      border: 1px dashed #FC6;
-    }
-
-    .albCt {
-      border-bottom: 1px dashed #FC0;
-      margin-bottom: 10px;
-      padding-bottom: 10px;
-    }
-  </style>
   <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">
-  <script language="javascript" src="../static/js/jquery.js"></script>
-  <script language="javascript" src="../static/js/dedeajax2.js"></script>
-  <link href="../static/css/daterangepicker.css" rel="stylesheet">
-  <script type="text/javascript" src="../static/js/moment.min.js"></script>
-  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
-  <script language='javascript' src="js/main.js"></script>
-  <script type="text/javascript" src="js/handlers.js"></script>
-  <script src="../static/js/bootstrap.bundle.js"></script>
+  <link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+  <link rel="stylesheet" href="css/base.css" type="text/css">
+  <link rel="stylesheet" href="../static/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
-  <link href="../static/css/cropper.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="../static/css/cropper.min.css">
+  <script src="../static/js/jquery.js"></script>
+  <script src="../static/js/dedeajax2.js"></script>
+  <script src="../static/js/moment.min.js"></script>
+  <script src="../static/js/daterangepicker.js"></script>
+  <script src="js/main.js"></script>
+  <script src="js/handlers.js"></script>
+  <script src="../static/js/bootstrap.bundle.js"></script>
   <script src="../static/js/cropper.min.js"></script>
-  <script language="javascript">
+  <script>
     var arctype = 'article';
     function checkSubmit() {
       if (document.form1.title.value == '') {
-        ShowMsg('文章标题不能为空！');
+        ShowMsg('文章标题不能为空');
         return false;
       }
       if (document.form1.typeid.value == 0) {
-        ShowMsg('请选择档案的主类别！');
+        ShowMsg('请选择档案的主类别');
         return false;
       }
     }
   </script>
   <style>
-    .albCt img {
-      cursor: pointer;
-    }
-
-    img {
-      vertical-align: baseline;
-    }
-
-    input,
-    select {
-      height: auto !important;
-    }
+body{background-image:#ffffff}
+table{border-collapse:separate}
+img{vertical-align:baseline}
+.albCt img{cursor:pointer}
+input,select{height:auto !important}
+.multipic{border:1px dashed #FC6}
+.albCt{border-bottom:1px dashed #FC0;margin-bottom:10px;padding-bottom:10px}
   </style>
 </head>
-
 <body topmargin="8">
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="mt-3">
     <tr>
-      <td width="60%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
-          href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>文章列表</u></a>
-        &gt;&gt; 发布文章</td>
-      <td width="30%" align='right'>&nbsp; <?php echo $backurl; ?><a class="btn btn-success btn-sm"
-          href="catalog_main.php">栏目管理</a> </td>
+      <td width="60%" height="30"><img src="images/book1.gif"><a href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives">文章列表</a> &gt;&gt; 发布文章</td>
+      <td width="30%" align="right"><?php echo $backurl; ?><a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a></td>
     </tr>
   </table>
-
-  <table width="97%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
+  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
     <tr>
       <td colspan="2">
         <table width="800" border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
-            <td><a href="#" class="btn btn-success btn-sm" onClick="ShowHide('getone')">单页采集...</a></td>
+            <td width="84" height="26" align="center" background="images/itemnote1.gif">常规信息</td>
+            <td><a href="#" class="btn btn-success btn-sm" onClick="ShowHide('getone')">单页采集</a></td>
           </tr>
         </table>
       </td>
     </tr>
   </table>
-  <table width="100%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FBFCE2" id="getone"
-    class="table table-borderless" style="<?php if(empty($geturl)) echo 'display:none'; ?>;margin:0;">
+  <table width="100%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FBFCE2" id="getone" class="table table-borderless" style="<?php if(empty($geturl)) echo 'display:none'; ?>;margin:0">
     <form name="getonepage" action="article_add.php" method="get">
-      <input type="hidden" name="channelid" value="<?php echo $channelid; ?>" />
-      <input type="hidden" name="cid" value="<?php echo $cid; ?>" />
+      <input type="hidden" name="channelid" value="<?php echo $channelid; ?>">
+      <input type="hidden" name="cid" value="<?php echo $cid; ?>">
       <tr>
         <td colspan="2">
           <table width="100%" border="0" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="220" height="31"><strong><a name="downurl"></a>&nbsp;采集单个网页-URL：</strong></td>
-              <td width="360" align="center"><input name="geturl" type="text" id="geturl" style="width:290px"
-                  value="<?php echo $geturl; ?>" /></td>
+              <td width="160" height="30"><a name="downurl"></a>采集单个网页：</td>
+              <td width="360" align="center"><input name="geturl" type="text" id="geturl" style="width:260px" value="<?php echo $geturl; ?>"></td>
               <td>
                 <button type="submit" class='btn btn-success btn-sm' name="Submit3">抓取</button>
-                &nbsp;
-                <button type="button" class='btn btn-success btn-sm' name="setrule"
-                  onClick="OpenMyWinCoOne('article_coonepage_rule.php')">规则管理</button></td>
+                <button type="button" class='btn btn-success btn-sm' name="setrule" onClick="OpenMyWinCoOne('article_coonepage_rule.php')">规则管理</button>
+              </td>
             </tr>
           </table>
         </td>
       </tr>
     </form>
   </table>
-
-  <form name="form1" action="article_add.php" enctype="multipart/form-data" method="post"
-    onSubmit="return checkSubmit()">
-    <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
-    <input type="hidden" name="dopost" value="save" />
+  <form name="form1" action="article_add.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit()">
+    <input type="hidden" name="channelid" value="<?php echo $channelid?>">
+    <input type="hidden" name="dopost" value="save">
     <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
-    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset"
-      style="border:1px solid #cfcfcf;background:#ffffff;">
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff">
       <tr>
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章标题：</td>
-              <td width='408'><input name="title" type="text" id="title" value="<?php echo $title; ?>"
-                  style="width:388px" /></td>
-              <td width="90">&nbsp;简略标题：</td>
-              <td>
-                <input name="shorttitle" type="text" id="shorttitle" style="width:150px" />
-              </td>
+              <td width="90" style="padding-left:10px">文章标题：</td>
+              <td width="400"><input name="title" type="text" id="title" value="<?php echo $title; ?>" style="width:380px"></td>
+              <td width="90" style="padding-left:10px">简略标题：</td>
+              <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100">&nbsp;自定义属性：</td>
+              <td width="100" style="padding-left:10px">自定义属性：</td>
               <td align="left">
               <?php
             	$dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
@@ -155,44 +119,39 @@
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="5" class="bline" id="redirecturltr" style="display:none">
+        <td height="26" colspan="5" class="bline" id="redirecturltr" style="display:none">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;跳转网址：</td>
-              <td>
-                <input name="redirecturl" type="text" id="redirecturl" style="width:300px" value="" />
-              </td>
+              <td width="90" style="padding-left:10px">跳转网址：</td>
+              <td><input name="redirecturl" type="text" id="redirecturl" style="width:300px" value=""></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td width="400%" height="24" colspan="2" class="bline">
+        <td width="400%" height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;TAG标签：</td>
-              <td><input name="tags" type="text" id="tags" value="" style="width:300px"
-                  onChange="$Obj('keywords').value=this.value;" />(','号分开，单个标签小于12字节)</td>
-              <td width="47">权重：</td>
-              <td><input name="weight" type="text" id="weight" style="width:50px"
-                  value="<?php echo $maxWright['cc'];?>" />(越小越靠前)</td>
+              <td width="90" style="padding-left:10px">Tag标签：</td>
+              <td><input name="tags" type="text" id="tags" value="" style="width:300px" onChange="$Obj('keywords').value=this.value;">（','号分开，单个标签小于12字节）</td>
+              <td width="50">权重：</td>
+              <td><input name="weight" type="text" id="weight" style="width:60px" value="<?php echo $maxWright['cc'];?>">（越小越靠前）</td>
             </tr>
           </table>
         </td>
       </tr>
       <tr id="pictable">
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90"> &nbsp;缩 略 图：</td>
+              <td width="90" style="padding-left:10px">缩略图：</td>
               <td width="560">
                 <table width="100%" border="0" cellspacing="1" cellpadding="1">
                   <tr>
                     <td height="30">
-                      <input name="picname" type="text" id="picname" style="width:240px" />
-                      <button type="button" name="Submit2" style="margin-left:8px;"
-                        onClick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>站内选择</button>
-                      <label><input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote' /> 远程</label>
+                      <input name="picname" type="text" id="picname" style="width:240px">
+                      <button type="button" name="Submit2" style="margin-left:8px" onClick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>站内选择</button>
+                      <label><input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote'>远程</label>
                       <span class="btn btn-success btn-sm fileinput-button">
                         <i class="glyphicon glyphicon-plus"></i>
                         选择图片
@@ -206,25 +165,23 @@
                   </tr>
                 </table>
               </td>
-              <td width="150" align="center">
-                <img id="litPic" src="../static/defaultpic.gif" style="height: 80px">
-              </td>
+              <td width="150" align="center"><img id="litPic" src="../static/defaultpic.gif" style="height:80px"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章来源：</td>
+              <td width="90" style="padding-left:10px">文章来源：</td>
               <td width="240">
-                <input name="source" type="text" id="source" style="width:160px" value="<?php echo $source; ?>"
-                  size="16" />
-                <button name="selsource" type="button" id="selsource" class="btn btn-success btn-sm">选择</button></td>
-              <td width="90">作　者：</td>
+                <input name="source" type="text" id="source" style="width:160px" value="<?php echo $source; ?>" size="16">
+                <button name="selsource" type="button" id="selsource" class="btn btn-success btn-sm">选择</button>
+              </td>
+              <td width="90" style="padding-left:10px">作者：</td>
               <td>
-                <input name="writer" type="text" id="writer" style="width:120px" value="<?php echo $writer; ?>" />
+                <input name="writer" type="text" id="writer" style="width:120px" value="<?php echo $writer; ?>">
                 <button name="selwriter" type="button" id="selwriter" class="btn btn-success btn-sm">选择</button>
               </td>
             </tr>
@@ -232,10 +189,10 @@
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100">&nbsp;文章主栏目：</td>
+              <td width="100" style="padding-left:10px">文章主栏目：</td>
               <td>
                 <span id='typeidct'>
                   <?php
@@ -244,10 +201,9 @@
                   echo "<option value='0'>请选择栏目...</option>\r\n";
                   echo $typeOptions;
                   echo "</select>";
-			?></span>
-                <img src='images//menusearch.gif' style='cursor:pointer;'
-                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid')" alt='快捷选择' title='快捷选择' />
-                &nbsp;
+                  ?>
+                </span>
+                <img src='images/menusearch.gif' style='cursor:pointer' onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid')" alt='快捷选择' title='快捷选择'>
                 <?php
                 if($cfg_need_typeid2=='Y')
                 {
@@ -259,45 +215,43 @@
           </table>
         </td>
       </tr>
-      <tr id='typeid2tr' style='display:none'>
-        <td height="24" colspan="5" class="bline">
+      <tr id="typeid2tr" style="display:none">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章副栏目：</td>
+              <td width="90" style="padding-left:10px">文章副栏目：</td>
               <td>
-                <span id='typeid2ct'></span><input type='text' name='typeid2' id='typeid2' value=''
-                  style='width:200px;' />
-                <img src='images/menusearch2.gif' style='cursor:pointer;'
-                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2')" alt='选择副栏目' title='选择副栏目' />
+                <span id="typeid2ct"></span>
+                <input type="text" name="typeid2" id="typeid2" value="" style="width:200px">
+                <img src="images/menusearch2.gif" style="cursor:pointer" onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2')" alt="选择副栏目" title="选择副栏目">
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;关键字：</td>
-              <td width="448"><input type='text' name="keywords" id="keywords" style="width:80%"
-                  value="<?php echo $keywords; ?>" /> <button type="button" name="Submit" style="width:56;height:20"
-                  onClick="SelectKeywords('form1.keywords');" class='btn btn-success btn-sm'>浏览...</button></td>
-              <td><label><input name="autokey" type="checkbox" onClick="ShowHide('keywords');" ; class="np" id="autokey"
-                    value="1" <?php if($cfg_arc_autokeyword=='Y') echo ' checked="1" '; ?> />
-                  自动获取，手动填写用","分开</label><br />
+              <td width="90" style="padding-left:10px">关键字：</td>
+              <td width="450">
+                <input type='text' name="keywords" id="keywords" style="width:80%" value="<?php echo $keywords; ?>">
+                <button type="button" name="Submit" style="width:56;height:20" onClick="SelectKeywords('form1.keywords');" class='btn btn-success btn-sm'>浏览...</button>
+              </td>
+              <td>
+                <label><input name="autokey" type="checkbox" onClick="ShowHide('keywords');" ; class="np" id="autokey" value="1" <?php if($cfg_arc_autokeyword=='Y') echo ' checked="1" '; ?>>&nbsp;自动获取，手动填写用","分开</label><br>
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="5" class="bline">
+        <td height="26" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;内容摘要：</td>
-              <td width="449"><textarea name="description" rows="5" id="description"
-                  style="width:80%;height:50px"><?php echo $description; ?></textarea></td>
-              <td width="261">&nbsp;</td>
+              <td width="90" style="padding-left:10px">内容摘要：</td>
+              <td width="450"><textarea name="description" rows="5" id="description"style="width:80%;height:50px"><?php echo $description; ?></textarea></td>
+              <td width="260"></td>
             </tr>
           </table>
         </td>
@@ -307,52 +261,36 @@
       </tr>
       <tr>
         <td height="28" colspan="2" bgcolor="#F9FCEF" class="bline2">
-          <div style='float:left;line-height:28px;'>&nbsp;<strong>文章内容：</strong></div>
-          <div style='float:right;;padding-right:8px'>
-            <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
-          </div>
-          <div style='float:right;padding-right:8px'>
-            <button type="submit" class="btn btn-success">保存</button>
-          </div>
+          <div style="float:left;padding-left:10px;line-height:26px">文章内容：</div>
+          <div style="float:right;;padding-right:10px"><button type="button" onClick="location.reload();" class="btn btn-success">重置</button></div>
+          <div style="float:right;padding-right:10px"><button type="submit" class="btn btn-success">保存</button></div>
         </td>
       </tr>
       <tr>
-        <td width="100%" height="24" colspan="2" class="bline">
+        <td width="100%" height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;附加选项：</td>
+              <td width="90" style="padding-left:10px">附加选项：</td>
               <td>
-                <label><input name="remote" type="checkbox" class="np" id="remote" value="1"
-                    <?php if($cfg_rm_remote=='Y') echo ' checked="1" '; ?> />
-                  下载远程图片和资源</label>
-                <label><input name="dellink" type="checkbox" class="np" id="dellink" value="1"
-                    <?php if($cfg_arc_dellink=='Y') echo ' checked="1" '; ?> />
-                  删除非站内链接 </label><a href="javascript:OpenMyWin('article_allowurl_edit.php');">[设置]</a>
-                <label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1"
-                    <?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?> />
-                  提取第一个图片为缩略图</label>
-                <label><input type='checkbox' name='needwatermark' value='1' class='np'
-                    <?php if($photo_markup=='1') echo "checked"; ?> />
-                  图片是否加水印</label>
+                <label><input name="remote" type="checkbox" class="np" id="remote" value="1" <?php if($cfg_rm_remote=='Y') echo ' checked="1" '; ?>>&nbsp;下载远程图片和资源&nbsp;</label>
+                <label><input name="dellink" type="checkbox" class="np" id="dellink" value="1" <?php if($cfg_arc_dellink=='Y') echo ' checked="1" '; ?>>&nbsp;删除非站内链接&nbsp;</label>
+                <a href="javascript:OpenMyWin('article_allowurl_edit.php')">[设置]</a>
+                <label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" <?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?>>&nbsp;提取第一个图片为缩略图&nbsp;</label>
+                <label><input type='checkbox' name='needwatermark' value='1' class='np' <?php if($photo_markup=='1') echo "checked"; ?>>&nbsp;图片是否加水印</label>
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td width="100%" height="24" colspan="2" class="bline">
+        <td width="100%" height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;分页方式：</td>
+              <td width="90" style="padding-left:10px">分页方式：</td>
               <td>
-                <label><input name="sptype" type="radio" class="np" value="hand"
-                    <?php if($cfg_arcautosp=='N') echo " checked='1' "?> />
-                  手动</label>
-                <label><input type="radio" name="sptype" value="auto" class="np"
-                    <?php if($cfg_arcautosp=='Y') echo " checked='1' "?> />
-                  自动</label>　大小：
-                <input name="spsize" type="text" id="spsize" value="<?php echo $cfg_arcautosp_size?>" size="6" /> K
-                (分页符为： <font color="#FF0000">#p#分页标题#e# </font>)
+                <label><input name="sptype" type="radio" class="np" value="hand" <?php if($cfg_arcautosp=='N') echo " checked='1' "?>>&nbsp;手动&nbsp;</label>
+                <label><input type="radio" name="sptype" value="auto" class="np" <?php if($cfg_arcautosp=='Y') echo " checked='1' "?>>&nbsp;自动&nbsp;</label>
+                大小：<input name="spsize" type="text" id="spsize" value="<?php echo $cfg_arcautosp_size?>" size="6"> K（分页符为：#p#分页标题#e#）
               </td>
             </tr>
           </table>
@@ -364,51 +302,44 @@
         GetEditor("body",$body,450);
         ?>
         </td>
-        <td width="255" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
+        <td width="250" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
       </tr>
     </table>
-    <!-- //高级参数 -->
-    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1" style="margin-top:10px;">
+    <!--高级参数-->
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1" style="margin-top:10px">
       <tr>
         <td>
           <table border="0" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;<a
-                  href='javascript:ShowHideT("adset")'><u>高级参数↑</u></a></td>
+              <td width="84" height="26" align="center" background="images/itemnote1.gif"><a href='javascript:ShowHideT("adset")'>高级参数↑</a></td>
             </tr>
           </table>
         </td>
       </tr>
     </table>
-    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset"
-      style="border:1px solid #cfcfcf;background:#ffffff;">
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset" style="border:1px solid #cfcfcf;background:#ffffff">
       <tr>
-        <td height="24" colspan="4" class="bline">
+        <td height="26" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90" height="22">&nbsp;评论选项：</td>
+              <td width="90" height="26" style="padding-left:10px">评论选项：</td>
               <td width="240">
-                <label><input type='radio' name='notpost' class='np' value='0'
-                    <?php if($cfg_feedback_forbid=='N') echo "checked='1' "; ?> /> 允许评论 </label>
-                &nbsp;
-                <label><input type='radio' name='notpost' class='np' value='1'
-                    <?php if($cfg_feedback_forbid=='Y') echo "checked='1' "; ?> /> 禁止评论 </label>
+                <label><input type="radio" name="notpost" class="np" value="0" <?php if($cfg_feedback_forbid=='N') echo "checked='1' "; ?>>&nbsp;允许评论&nbsp;</label>
+                <label><input type="radio" name="notpost" class="np" value="1" <?php if($cfg_feedback_forbid=='Y') echo "checked='1' "; ?>>&nbsp;禁止评论&nbsp;</label>
               </td>
               <td width="90">浏览次数：</td>
               <td>
-                <input type='text' name='click'
-                  value='<?php echo ($cfg_arc_click=='-1' ? mt_rand(50, 200) : $cfg_arc_click); ?>'
-                  style='width:100px;' />
+                <input type="text" name="click" value="<?php echo ($cfg_arc_click=='-1' ? mt_rand(50, 200) : $cfg_arc_click); ?>" style="width:100px">
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="4" class="bline">
+        <td height="26" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90" height="22">&nbsp;文章排序：</td>
+              <td width="90" height="26" style="padding-left:10px">文章排序：</td>
               <td width="240">
                 <select name="sortup" id="sortup" style="width:150px">
                   <option value="0" selected>默认排序</option>
@@ -420,19 +351,18 @@
                 </select> </td>
               <td width="90">标题颜色：</td>
               <td>
-                <input name="color" type="text" id="color" style="width:120px" />
-                <button class="btn btn-success btn-sm" name="modcolor" type="button" id="modcolor"
-                  onClick="ShowColor(event, this)">选取</button>
+                <input name="color" type="text" id="color" style="width:120px">
+                <button class="btn btn-success btn-sm" name="modcolor" type="button" id="modcolor" onClick="ShowColor(event, this)">选取</button>
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="4" class="bline">
+        <td height="26" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;阅读权限：</td>
+              <td width="90" style="padding-left:10px">阅读权限：</td>
               <td width="240"> <select name="arcrank" id="arcrank" style="width:150px">
                 <?php
                 $urank = $cuserLogin->getUserRank();
@@ -440,45 +370,41 @@
                 $dsql->Execute();
                 while($row = $dsql->GetObject())
                 {
-                	echo "     <option value='".$row->rank."'>".$row->membername."</option>\r\n";
+                	echo "<option value='".$row->rank."'>".$row->membername."</option>\r\n";
                 }
                 ?>
                 </select> </td>
               <td width="90">消费金币：</td>
-              <td>
-                <input name="money" type="text" id="money" value="0" size="10" /> </td>
+              <td><input name="money" type="text" id="money" value="0" size="10"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="4" class="bline">
+        <td height="26" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;发布时间：</td>
-              <td width="241">
+              <td width="90" style="padding-left:10px">发布时间：</td>
+              <td width="240">
                 <?php
                 $nowtime = GetDateTimeMk(time());
                 echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" class='datepicker'>";
-
                 ?>
               </td>
-              <td width="90">发布选项：</td>
-              <td width="379">
-                <label><input name="ishtml" type="radio" class="np" value="1" checked="1" />
-                  生成HTML</label>
-                <label><input type="radio" name="ishtml" class="np" value="0" />
-                  仅动态浏览</label> </td>
+              <td width="90" style="padding-left:10px">发布选项：</td>
+              <td width="380">
+                <label><input name="ishtml" type="radio" class="np" value="1" checked="1">&nbsp;生成HTML&nbsp;</label>
+                <label><input type="radio" name="ishtml" class="np" value="0">&nbsp;仅动态浏览</label></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="4">
+        <td height="26" colspan="4">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="109">&nbsp;自定义文件名：</td>
-              <td width="351"><input type="text" name="filename" id="filename" />（不包括后缀名如.html等）</td>
+              <td width="110" style="padding-left:10px">自定义文件名：</td>
+              <td width="350"><input type="text" name="filename" id="filename">（不包括后缀名如.html等）</td>
               <td width="340">
                 <?php
                 if(isset($cfg_tamplate_rand) && $cfg_tamplate_rand==1)
@@ -496,9 +422,8 @@
                   ?>
                 </select>
                 <?php
-	}
-	else{
-		echo "<input type='hidden' name='templet' value='' />";
+                } else {
+                  echo "<input type='hidden' name='templet' value=''>";
                 }
                 ?>
               </td>
@@ -507,11 +432,10 @@
         </td>
       </tr>
     </table>
-    <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#F9FCEF"
-      style="border:1px solid #cfcfcf;border-top:none;" class="mb-3">
-      <tr height="35">
-        <td width="17%">&nbsp;</td>
-        <td width="83%" class="py-3">
+    <table width="98%" border="0" cellspacing="0" cellpadding="0" align="center" bgcolor="#F9FCEF" style="border:1px solid #cfcfcf;border-top:none" class="mb-3">
+      <tr height="36">
+        <td width="4%"></td>
+        <td width="96%" class="py-3">
           <button type="submit" class="btn btn-success">保存</button>
           <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
         </td>
@@ -519,7 +443,6 @@
     </table>
   </form>
   <div id="__tmpbody" style="display:none"></div>
-  <script language='javascript'>InitPage();</script>
+  <script>InitPage();</script>
 </body>
-
 </html>

src/dede/templets/article_edit.htm

@@ -1,59 +1,45 @@
-<!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">
-
+<!DOCTYPE html>
+<html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <meta charset="<?php echo $cfg_soft_lang; ?>">
   <title>更改文章</title>
-  <style type="text/css">
-    body {
-      background-image: url(images/allbg.gif);
-    }
-  </style>
   <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">
-  <script language="javascript" src="../static/js/jquery.js"></script>
-  <script language="javascript" src="../static/js/dedeajax2.js"></script>
-  <link href="../static/css/daterangepicker.css" rel="stylesheet">
-  <script type="text/javascript" src="../static/js/moment.min.js"></script>
-  <script type="text/javascript" src="../static/js/daterangepicker.js"></script>
-  <script language="javascript" src="js/main.js"></script>
-  <script type="text/javascript" src="js/handlers.js"></script>
-  <script src="../static/js/bootstrap.bundle.js"></script>
+  <link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+  <link rel="stylesheet" href="css/base.css" type="text/css">
+  <link rel="stylesheet" href="../static/css/daterangepicker.css">
   <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
-  <link href="../static/css/cropper.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="../static/css/cropper.min.css">
+  <script src="../static/js/jquery.js"></script>
+  <script src="../static/js/dedeajax2.js"></script>
+  <script src="../static/js/moment.min.js"></script>
+  <script src="../static/js/daterangepicker.js"></script>
+  <script src="js/main.js"></script>
+  <script src="js/handlers.js"></script>
+  <script src="../static/js/bootstrap.bundle.js"></script>
   <script src="../static/js/cropper.min.js"></script>
-  <script language="javascript">
+  <script>
     var swfu = null;
     var arctype = 'article';
     function checkSubmit() {
       if (document.form1.title.value == '') {
-        ShowMsg('文章标题不能为空！');
+        ShowMsg('文章标题不能为空');
         document.form1.title.focus();
         return false;
       }
     }
   </script>
   <style>
-    .albCt img {
-      cursor: pointer;
-    }
-
-    img {
-      vertical-align: baseline;
-    }
+body{background-image:#ffffff}
+table{border-collapse:separate}
+img{vertical-align:baseline}
+.albCt img{cursor:pointer}
   </style>
 </head>
-
 <body topmargin="8">
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="mt-3">
     <tr>
-      <td width="60%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
-          href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>文章列表</u></a>
-        &gt;&gt; 更改文章</td>
-      <td width="30%" align='right'>&nbsp; <?php echo $backurl; ?><a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a></td>
-      <td width="1%">&nbsp;</td>
+      <td width="60%" height="30"><img src="images/book1.gif"><a href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&channelid=<?php echo $channelid?>&dopost=listArchives">文章列表</a> &gt;&gt; 更改文章</td>
+      <td width="30%" align="right"><?php echo $backurl; ?><a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a></td>
     </tr>
   </table>
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
@@ -61,9 +47,8 @@
       <td colspan="2">
         <table border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
-                onClick="ShowItem2()"><u>高级参数</u></a></td>
+            <td width="84" height="26" align="center" background="images/itemnote1.gif">常规信息</td>
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem2()">高级参数</a></td>
           </tr>
         </table>
       </td>
@@ -72,44 +57,40 @@
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head2" style="display:none">
     <tr>
       <td colspan="2">
-        <table height="24" border="0" cellpadding="0" cellspacing="0">
+        <table height="26" border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
-                onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem1()">常规信息</a></td>
             <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
           </tr>
         </table>
       </td>
     </tr>
   </table>
-  <form name="form1" action="article_edit.php" enctype="multipart/form-data" method="post"
-    onSubmit="return checkSubmit();">
-    <input type="hidden" name="dopost" value="save" />
-    <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
-    <input type="hidden" name="id" value="<?php echo $aid?>" />
+  <form name="form1" action="article_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
+    <input type="hidden" name="dopost" value="save">
+    <input type="hidden" name="channelid" value="<?php echo $channelid?>">
+    <input type="hidden" name="id" value="<?php echo $aid?>">
     <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
-    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset"
-      style="border:1px solid #cfcfcf;background:#ffffff;">
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff;">
       <tr>
-        <td height="24" colspan="2" class="bline">
+        <td height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章标题：</td>
-              <td width='408'><input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>"
-                  style="width:388px"></td>
-              <td width="90">&nbsp;简略标题：</td>
-              <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px"
-                  value="<?php echo $arcRow['shorttitle']; ?>"></td>
+              <td width="90" style="padding-left:10px">文章标题：</td>
+              <td width="400"><input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>" style="width:380px"></td>
+              <td width="90">简略标题：</td>
+              <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px" value="<?php echo $arcRow['shorttitle']; ?>"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td width="400%" height="24" colspan="2" class="bline">
+        <td width="400%" height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100">&nbsp;自定义属性：</td>
-              <td><?php
+              <td width="100" style="padding-left:10px">自定义属性：</td>
+              <td>
+                <?php
                 $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
                 $dsql->Execute();
                 while($trow = $dsql->GetObject())
@@ -117,63 +98,52 @@
                   if($trow->att=='j')
                   {
                     $jumpclick = " onclick='ShowUrlTr()'";
-         	}
-         	else
-         	{
+                  } else {
                     $jumpclick = '';
                   }
                   if(preg_match("#".$trow->att."#", $arcRow['flag']))
                   {
-         		echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' {$jumpclick} checked='checked' /> {$trow->attname}[{$trow->att}]</label> ";
-         	}
-
-         	else
-         	{
-         		echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'{$jumpclick} /> {$trow->attname}[{$trow->att}]</label> ";
+                    echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' {$jumpclick} checked='checked'> {$trow->attname}[{$trow->att}]</label> ";
+                  } else {
+                    echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'{$jumpclick}> {$trow->attname}[{$trow->att}]</label> ";
                   }
                 }
-          ?></td>
+                ?>
+              </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="2" class="bline" id="redirecturltr"
-          style="display:<?php echo (empty($addRow['redirecturl']) ? 'none' : 'block');?>">
+        <td height="26" colspan="2" class="bline" id="redirecturltr" style="display:<?php echo (empty($addRow['redirecturl']) ? 'none' : 'block');?>">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;跳转网址：</td>
-              <td><input name="redirecturl" type="text" id="redirecturl" style="width:300px"
-                  value="<?php echo $addRow["redirecturl"]?>" /></td>
+              <td width="90" style="padding-left:10px">跳转网址：</td>
+              <td><input name="redirecturl" type="text" id="redirecturl" style="width:300px" value="<?php echo $addRow["redirecturl"]?>"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td width="400%" height="24" colspan="2" class="bline">
+        <td width="400%" height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;Tag标签：</td>
-              <td><input name="tags" type="text" id="tags" value="<?php echo $tags; ?>" style="width:300px" />
-                (','号分开，单个标签小于12字节)</td>
+              <td width="90" style="padding-left:10px">Tag标签：</td>
+              <td><input name="tags" type="text" id="tags" value="<?php echo $tags; ?>" style="width:300px">（','号分开，单个标签小于12字节）</td>
               <td width="40">权重：</td>
-              <td width="141"><input name="weight" type="text" id="weight" style="width:50px"
-                  value="<?php echo $arcRow['weight'];?>" />
-                (越小越靠前)</td>
+              <td width="160"><input name="weight" type="text" id="weight" style="width:60px" value="<?php echo $arcRow['weight'];?>">（越小越靠前）</td>
             </tr>
           </table>
         </td>
       </tr>
       <tr id="pictable">
-        <td height="24" colspan="2" class="bline">
+        <td height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90" height="81">&nbsp;缩 略 图：<br /></td>
-              <td><input name="picname" type="text" id="picname" style="width:300px"
-                  value="<?php echo $arcRow["litpic"]?>">
-
-                <label><input type='checkbox' class='np' name='ddisremote' value='1' />
-                远程</label>
+              <td width="90" height="80" style="padding-left:10px">缩略图：</td>
+              <td>
+                <input name="picname" type="text" id="picname" style="width:300px" value="<?php echo $arcRow['litpic']?>">
+                <label><input type='checkbox' class='np' name='ddisremote' value='1'>远程</label>
                 <span class="btn btn-success btn-sm fileinput-button">
                   <i class="glyphicon glyphicon-plus"></i>
                   选择图片
@@ -185,167 +155,163 @@
                 </button>
               </td>
               <td align="center">
-                <img id="litPic"
-                  src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "../static/defaultpic.gif";?>"
-                  style="height: 80px">
+                <img id="litPic" src="<?php if($arcRow['litpic']!='') echo $arcRow['litpic']; else echo '../static/defaultpic.gif'; ?>" style="height:80px">
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="2" class="bline">
+        <td height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章来源：</td>
-              <td width="250"><input name="source" type="text" id="source" style="width:160px"
-                  value="<?php echo $arcRow["source"]?>" size="16">
+              <td width="90" style="padding-left:10px">文章来源：</td>
+              <td width="240">
+                <input name="source" type="text" id="source" style="width:160px" value="<?php echo $arcRow['source']?>" size="16">
                 <button name="selsource" type="button" id="selsource" class="btn btn-success btn-sm">选择</button></td>
-              <td width="90">作　者：</td>
-              <td><input name="writer" type="text" id="writer" style="width:120px"
-                  value="<?php echo $arcRow["writer"]?>">
-                <button name="selwriter" type="button" id="selwriter" class="btn btn-success btn-sm">选择</button></td>
+              <td width="90">作者：</td>
+              <td>
+                <input name="writer" type="text" id="writer" style="width:120px" value="<?php echo $arcRow['writer']?>">
+                <button name="selwriter" type="button" id="selwriter" class="btn btn-success btn-sm">选择</button>
+              </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="2" class="bline">
+        <td height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100">&nbsp;文章主栏目：</td>
-              <td><?php
+              <td width="100" style="padding-left:10px">文章主栏目：</td>
+              <td>
+                <?php
                 $typeOptions = GetOptionList($arcRow['typeid'],$cuserLogin->getUserChannel(),$channelid);
-            echo "<select name='typeid' id='typeid' style='width:240px'>\r\n";
-            if($arcRow["typeid"]=="0") echo "<option value='0' selected>请选择栏目...</option>\r\n";
+                echo "<select name='typeid' id='typeid' style='width:240px'>";
+                if($arcRow["typeid"]=="0") echo "<option value='0' selected>请选择栏目</option>";
                 echo $typeOptions;
                 echo "</select>";
                 ?>
-                <img src='images/menusearch.gif' style='cursor:pointer'
-                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid', '<?php echo $arcRow['typeid']; ?>')"
-                  alt='快捷选择' title='快捷选择' />
+                <img src="images/menusearch.gif" style="cursor:pointer" onClick="ShowCatMap(event,this,<?php echo $channelid; ?>,'typeid','<?php echo $arcRow['typeid']; ?>')" alt="快捷选择" title="快捷选择">
               </td>
             </tr>
           </table>
         </td>
       </tr>
       <?php
-if($cfg_need_typeid2=='Y') {
-?>
+      if($cfg_need_typeid2=='Y') {
+      ?>
       <tr>
-        <td height="24" colspan="2" class="bline">
+        <td height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="100">&nbsp;文章副栏目：</td>
-              <td><span id='typeid2ct'></span>
-                <input type='text' name='typeid2' id='typeid2'
-                  value='<?php echo ($arcRow['typeid2']=='0' ? '' : $arcRow['typeid2']); ?>' style='width:200px;' />
-                <img src='images/menusearch2.gif' style='cursor:pointer;'
-                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2', '<?php echo $arcRow['typeid2']; ?>')"
-                  alt='选择副栏目' title='选择副栏目' /></td>
+              <td width="90" style="padding-left:10px">文章副栏目：</td>
+              <td>
+                <span id="typeid2ct"></span>
+                <input type="text" name="typeid2" id="typeid2" value="<?php echo ($arcRow['typeid2']=='0'?'':$arcRow['typeid2']); ?>" style="width:200px">
+                <img src="images/menusearch2.gif" style="cursor:pointer" onClick="ShowCatMap(event,this,<?php echo $channelid; ?>,'typeid2','<?php echo $arcRow['typeid2']; ?>')" alt="选择副栏目" title="选择副栏目">
+              </td>
             </tr>
           </table>
         </td>
       </tr>
-      <?php } ?>
+      <?php
+      }
+      ?>
       <tr>
-        <td colspan="2"><?php
+        <td colspan="2">
+          <?php
           PrintAutoFieldsEdit($cInfos['fieldset'],$addRow,'autofield');
-      ?></td>
+          ?>
+        </td>
       </tr>
       <tr>
-        <td height="24" colspan="2" bgcolor="#F9FCEF" class="bline2">&nbsp;文章内容：</td>
+        <td height="26" colspan="2" bgcolor="#F9FCEF" class="bline2" style="padding-left:10px">文章内容：</td>
       </tr>
       <tr>
-        <td width="400%" height="24" colspan="2" class="bline">
+        <td width="400%" height="26" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;附加选项：</td>
+              <td width="90" style="padding-left:10px">附加选项：</td>
               <td>
-                <label><input name="remote" type="checkbox" class="np" id="remote" value="1" <?php if($cfg_rm_remote=='Y') echo ' checked="1" '; ?>>
-                下载远程图片和资源</label>
-                <label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" <?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?>>
-                提取第一个图片为缩略图</label> </td>
+                <label><input name="remote" type="checkbox" class="np" id="remote" value="1" <?php if($cfg_rm_remote=='Y') echo ' checked="1" '; ?>>&nbsp;下载远程图片和资源&nbsp;</label>
+                <label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" <?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?>>&nbsp;提取第一个图片为缩略图</label>
+              </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
         <td width="100%"><?php GetEditor("body",stripcslashes($addRow['body']),450); ?></td>
-        <td width="255" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
+        <td width="250" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
       </tr>
     </table>
-    <!-- //高级参数 -->
-    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset"
-      style="border:1px solid #cfcfcf;background:#ffffff;display:none">
+    <!--高级参数-->
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset" style="border:1px solid #cfcfcf;background:#ffffff;display:none">
       <tr>
-        <td height="24" colspan="4" class="bline">
+        <td height="26" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110" height="22">&nbsp;评论选项：</td>
+              <td width="110" height="26" style="padding-left:10px">评论选项：</td>
               <td width="250">
-                <label><input type='radio' name='notpost' class='np' value='0'
-                  <?php if($arcRow['notpost']==0) echo " checked='1' "; ?> />
-                允许评论</label>
-                &nbsp;
-                <label><input type='radio' name='notpost' class='np' value='1'
-                  <?php if($arcRow['notpost']==1) echo " checked='1' "; ?> />
-                禁止评论</label> </td>
+                <label><input type="radio" name="notpost" class="np" value="0" <?php if($arcRow['notpost']==0) echo " checked='1' "; ?>>&nbsp;允许评论&nbsp;</label>
+                <label><input type="radio" name="notpost" class="np" value="1" <?php if($arcRow['notpost']==1) echo " checked='1' "; ?>>&nbsp;禁止评论</label>
+              </td>
               <td width="90">浏览次数：</td>
-              <td><input type='text' name='click' value='<?php echo $arcRow['click']; ?>' style='width:100px;' /></td>
+              <td><input type="text" name="click" value="<?php echo $arcRow['click']; ?>" style="width:100px"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" class="bline">
+        <td height="26" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110">&nbsp;文章排序：</td>
-              <td width="250"><select name="sortup" id="sortup" style="width:150">
+              <td width="110" style="padding-left:10px">文章排序：</td>
+              <td width="250">
+                <select name="sortup" id="sortup" style="width:150">
                   <?php
                   $subday = SubDay($arcRow["sortrank"],$arcRow["pubdate"]);
-                echo "<option value='0'>正常排序</option>\r\n";
-                if($subday>0) echo "<option value='$subday' selected>置顶 $subday 天</option>\r\n";
+                  echo "<option value='0'>正常排序</option>";
+                  if($subday>0) echo "<option value='$subday' selected>置顶 $subday 天</option>";
                   ?>
                   <option value="7">置顶一周</option>
                   <option value="30">置顶一个月</option>
                   <option value="90">置顶三个月</option>
                   <option value="180">置顶半年</option>
                   <option value="360">置顶一年</option>
-                </select></td>
+                </select>
+              </td>
               <td width="90">标题颜色：</td>
-              <td><input name="color" type="text" id="color" style="width:120" value="<?php echo $arcRow["color"]?>">
-                <button name="modcolor" type="button" id="modcolor" onClick="ShowColor(event,this)" class="btn btn-success btn-sm">选取</button></td>
+              <td>
+                <input name="color" type="text" id="color" style="width:120" value="<?php echo $arcRow['color']?>">
+                <button name="modcolor" type="button" id="modcolor" onClick="ShowColor(event,this)" class="btn btn-success btn-sm">选取</button>
+              </td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" class="bline">
+        <td height="26" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110">&nbsp;阅读权限：</td>
-              <td width="250"><select name="arcrank" id="arcrank" style="width:150">
+              <td width="110" style="padding-left:10px">阅读权限：</td>
+              <td width="250">
+                <select name="arcrank" id="arcrank" style="width:150">
                   <option value='<?php echo $arcRow["arcrank"]?>'> <?php echo $arcRow["rankname"]?> </option>
                   <?php
                   $urank = $cuserLogin->getUserRank();
-
                   $dsql->SetQuery("Select * from `#@__arcrank` where adminrank<='$urank'");
                   $dsql->Execute();
                   while($row = $dsql->GetObject()){
-                	echo "     <option value='".$row->rank."'>".$row->membername."</option>\r\n";
+                    echo "<option value='".$row->rank."'>".$row->membername."</option>";
                   }
                   ?>
-                </select></td>
+                </select>
+              </td>
               <td width="90">发布选项：</td>
               <td>
-                <label><input name="ishtml" type="radio" class="np" value="1"
-                  <?php if($arcRow["ismake"]!=-1) echo " checked";?>>
-                生成HTML</label>
-                <label><input type="radio" name="ishtml" class="np" value="0"
-                  <?php if($arcRow["ismake"]==-1) echo " checked";?>>
-                仅动态浏览</label></td>
+                <label><input name="ishtml" type="radio" class="np" value="1" <?php if($arcRow["ismake"]!=-1) echo " checked";?>>&nbsp;生成HTML&nbsp;</label>
+                <label><input type="radio" name="ishtml" class="np" value="0" <?php if($arcRow["ismake"]==-1) echo " checked";?>>&nbsp;仅动态浏览</label></td>
             </tr>
           </table>
         </td>
@@ -354,87 +320,79 @@ if($cfg_need_typeid2=='Y') {
         <td height="75" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110">&nbsp;更新时间：</td>
+              <td width="110" style="padding-left:10px">更新时间：</td>
               <td width="250"><?php
               $nowtime = GetDateTimeMk(time());
               echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" class='datepicker'>";
               ?>
               </td>
-              <td width="92">消费金币：</td>
-              <td width="368"><input name="money" type="text" id="money" value="<?php echo $arcRow["money"]?>"
-                  size="10"></td>
+              <td width="90">消费金币：</td>
+              <td width="370"><input name="money" type="text" id="money" value="<?php echo $arcRow['money']?>" size="10"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" class="bline">
+        <td height="26" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110" height="51">&nbsp;关键字：</td>
-              <td><input type="text" name="keywords" id="keywords" style="width:60%"
-                  value="<?php echo $arcRow["keywords"]?>" /></td>
+              <td width="110" height="50" style="padding-left:10px">关键字：</td>
+              <td><input type="text" name="keywords" id="keywords" style="width:60%" value="<?php echo $arcRow['keywords']?>"></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" class="bline">
+        <td height="26" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110" height="51">&nbsp;文章摘要：</td>
-              <td><textarea name="description" rows="5" id="description"
-                  style="width:80%"><?php echo $arcRow["description"]?></textarea></td>
+              <td width="110" height="50" style="padding-left:10px">文章摘要：</td>
+              <td><textarea name="description" rows="5" id="description" style="width:80%"><?php echo $arcRow['description']?></textarea></td>
             </tr>
           </table>
         </td>
       </tr>
       <tr>
-        <td height="24" colspan="4">
+        <td height="26" colspan="4">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="110">&nbsp;自定义文件名：</td>
-              <td><input type="text" name="filename" id="filename" value="<?php echo $arcRow["filename"]?>" />
-                （不包括后缀名如.html等）</td>
-              <td><?php
+              <td width="110" style="padding-left:10px">自定义文件名：</td>
+              <td><input type="text" name="filename" id="filename" value="<?php echo $arcRow['filename']?>">（不包括后缀名如.html等）</td>
+              <td>
+                <?php
                 if(isset($cfg_tamplate_rand) && $cfg_tamplate_rand==1)
                 {
                 ?>
                 模板选择：
-                <select name='templet' id='templet' style='width:200px' size='1'>
+                <select name="templet" id="templet" style="width:200px" size="1">
                   <?php
                   foreach($cfg_tamplate_arr as $k=>$v)
                   {
                     $v = trim($v);
-         echo ($v==$addRow['templet'] ? "<option value='$v' selected>$v</option>\r\n" : "<option value='$v'>$v</option>\r\n");
+                    echo ($v==$addRow['templet'] ? "<option value='$v' selected>$v</option>":"<option value='$v'>$v</option>");
                   }
                   ?>
                 </select>
                 <?php
+                } else {
+                  echo "<input type='hidden' name='templet' value='{$addRow['templet']}'>";
                 }
-	else{
-		echo "<input type='hidden' name='templet' value='{$addRow['templet']}' />";
-	}
-  ?></td>
+                ?>
+              </td>
             </tr>
           </table>
         </td>
       </tr>
     </table>
-    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF"
-      style="border:1px solid #cfcfcf;border-top:none;" class="mb-3">
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF" style="border:1px solid #cfcfcf;border-top:none" class="mb-3">
       <tr>
-        <td height="35">
+        <td height="36">
           <table width="100%" border="0" cellspacing="1" cellpadding="1">
             <tr>
-              <td width="17%">&nbsp;</td>
-              <td width="83%">
-                <table width="214" border="0" cellspacing="0" cellpadding="0">
-                  <tr>
-                    <td width="115" class="py-3"><button type="submit" class="btn btn-success">保存</button></td>
-                    <td width="99" class="py-3"><button type="button" onClick="location.reload();" class="btn btn-success">重置</button></td>
-                  </tr>
-                </table>
+              <td width="4%"></td>
+              <td width="96%">
+                <button type="submit" class="btn btn-success">保存</button>
+                <button type="button" onClick="location.reload();" class="btn btn-success">重置</button>
               </td>
             </tr>
           </table>
@@ -445,5 +403,4 @@ if($cfg_need_typeid2=='Y') {
   </form>
   <div id="__tmpbody" style="display:none"></div>
 </body>
-
 </html>

src/dede/templets/content_list.htm

@@ -1,175 +1,136 @@
-<!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">
-
+<!DOCTYPE html>
+<html>
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+	<meta 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>
+	<style>
+.btn+.btn{margin-left:10px}
+	</style>
 </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">
+<body leftmargin="8" topmargin="8" background="images/allbg.gif" onLoad="ContextMenu.intializeContextMenu()">
+	<table width="98%" 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>
-				{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>
+			<td>
+				<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>
 				{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" 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>
 			</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;(使用鼠标右键弹出菜单)
+	<form name="form3" action="content_list.php" method="get">
+		<input type="hidden" name="dopost" value="listArchives">
+		<table width="98%" cellpadding="1" cellspacing="1" align="center" class="mb-3" style="margin-top:10px;border:1px solid #dee2e6">
+			<tr>
+				<td style="background:#f2f2f2">
+					<table cellpadding="0" cellspacing="0" height="36">
+						<tr>
+							<td>
+								<select name="cid" style="margin:0 10px;width:160px">
+									<option value="0">选择栏目</option>
+									{dede:global.optionarr/}
+								</select>
 							</td>
+							<td>关键字：</td>
+							<td><input name="keyword" type="text" value="{dede:global.keyword/}" style="margin-right:10px;width:260px"></td>
+							<td>
+								<select name="orderby" style="margin-right:10px;width:160px">
+									<option value="id">选择排序</option>
+									<option value="pubdate">更新时间</option>
+									<option value="sortrank">置顶权值</option>
+									<option value="click">点击量</option>
+									<option value="scores">评论积分</option>
+									<option value="lastpost">最后评论</option>
+								</select>
+							</td>
+							<td>
+								<select name="flag" style="margin-right:10px;width:160px">
+									<option value="">选择属性</option>
+									{dede:global.flagsArr/}
+								</select>
+							</td>
+							<td><button type="submit" class="btn btn-success btn-sm">搜索</button></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</form>
+	<form name="form2">
+		<table width="98%" cellpadding="2" cellspacing="1" bgcolor="#CFCFCF" align="center" class="table table-bordered maintable" style="margin-top:10px">
+			<tr>
+				<td height="30" colspan="10" style="margin-left:10px;background:#f2f2f2">{dede:global.positionname/}文档列表（使用鼠标右键弹出菜单）</td>
 			</tr>
-			<tr align="center" bgcolor="#FBFCE2" height="25">
+			<tr align="center" bgcolor="#FBFCE2" height="26">
 				<td width="6%">ID</td>
-				<td width="4%">选择</td>
-				<td width="25%">文章标题</td>
+				<td width="6%">选择</td>
+				<td width="30%">文章标题</td>
 				<td width="10%">更新时间</td>
-				<td width="10%">类目</td>
-				<td width="8%">点击</td>
+				<td width="14%">类目</td>
+				<td width="6%">点击</td>
 				<td width="6%">HTML</td>
-				<td width="8%">权限</td>
-				<td width="8%">发布人</td>
-				<td width="12%">操作</td>
+				<td width="6%">权限</td>
+				<td width="6%">发布人</td>
+				<td width="10%">操作</td>
 			</tr>
 			{dede:datalist}
-			<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>
-				<td>
-					<input name="arcID" type="checkbox" id="arcID" value="{dede:field.id/}" class="np" />
-				</td>
-				<td align='left'>
+			<tr align="center" bgcolor="#ffffff" height="26" align="center" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#ffffff';">
+				<td>{dede:field.id/}</td>
+				<td><input name="arcID" type="checkbox" id="arcID" value="{dede:field.id/}" class="np"></td>
+				<td align="left">
 					<span id="arc{dede:field.id/}">
-						<a href='archives_do.php?aid={dede:field.id/}&dopost=editArchives'
-							oncontextmenu="ShowMenu(event,this,{dede:field.id/},'{dede:field.title function="
-							str_replace('\'', '' , @me)" /}')">
-							<u>{dede:field.title/}</u>
-						</a>
+						<a href="archives_do.php?aid={dede:field.id/}&dopost=editArchives" oncontextmenu="ShowMenu(event,this,{dede:field.id/},'{dede:field.title function="str_replace('\'','',@me)"/}')">{dede:field.title/}</a>
 					</span>
 					{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>
 				<td>{dede:field.mid function=GetMemberName(@me)/}</td>
 				<td>
-					<a href="javascript:;" title="编辑属性" class="btn btn-success btn-sm" onClick="QuickEdit('{dede:field.id/}', event, this);"> <i class="fa fa-cogs" aria-hidden="true"></i></a>
-					<a href="javascript:;" title="编辑" class="btn btn-success btn-sm" onClick="editArc({dede:field.id/});"> <i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>
-					<a href="javascript:;" title="预览" class="btn btn-success btn-sm" onClick="viewArc({dede:field.id/});"> <i class="fa fa-globe" aria-hidden="true"></i></a>
+					<a href="javascript:;" title="属性" class="btn btn-success btn-sm" onClick="QuickEdit('{dede:field.id/}',event,this);"><i class="fa fa-cogs" aria-hidden="true"></i></a>
+					<a href="javascript:;" title="编辑" class="btn btn-success btn-sm" onClick="editArc({dede:field.id/});"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>
+					<a href="javascript:;" title="预览" class="btn btn-success btn-sm" onClick="viewArc({dede:field.id/});"><i class="fa fa-globe" aria-hidden="true"></i></a>
 				</td>
 			</tr>
 			{/dede:datalist}
-			<tr bgcolor="#ffffff">
-				<td height="36" colspan="10">
-					&nbsp;
+			<tr>
+				<td height="36" colspan="10" style="margin-left:10px;background:#ffffff">
 					<a class="btn btn-success btn-sm" href="javascript:selAll()">全选</a>
 					<a class="btn btn-success btn-sm" href="javascript:noSelAll()">取消</a>
-					<a class="btn btn-success btn-sm" href="javascript:updateArc(0)">&nbsp;更新&nbsp;</a>
-					<a class="btn btn-success btn-sm" href="javascript:checkArc(0)">&nbsp;审核&nbsp;</a>
-					<a class="btn btn-success btn-sm" href="javascript:adArc(0)">&nbsp;推荐&nbsp;</a>
-					<a class="btn btn-success btn-sm" href="javascript:;"
-						onClick="moveArc(event,this,<?php echo (empty($channelid) ? 0 : $channelid); ?>)"
-						class="coolbg">&nbsp;移动&nbsp;</a>
-					<a class="btn btn-success btn-sm" href="javascript:delArc(0)">&nbsp;删除&nbsp;</a>
-					<?php if($channelid==1) echo "	<a class='btn btn-success btn-sm' href='javascript:kwArc(0)' class='coolbg'>&nbsp;自动关键字&nbsp;</a>\r\n"; ?>
-					<a class="btn btn-success btn-sm" href="javascript:;" onClick="cAtts('attsAdd',event,this)" class="coolbg">&nbsp;增加属性&nbsp;</a>
-					<a href="javascript:;" onClick="cAtts('attsDel',event,this)" class="btn btn-success btn-sm">&nbsp;删除属性&nbsp;</a>
-				</td>
-			</tr>
-	</form>
-	<tr align="right" bgcolor="#F9FCEF">
-		<td height="36" colspan="10" align="center">
-			{dede:pagelist listsize=3/}
+					<a class="btn btn-success btn-sm" href="javascript:updateArc(0)">更新</a>
+					<a class="btn btn-success btn-sm" href="javascript:checkArc(0)">审核</a>
+					<a class="btn btn-success btn-sm" href="javascript:adArc(0)">推荐</a>
+					<a class="btn btn-success btn-sm" href="javascript:;" onClick="moveArc(event,this,<?php echo (empty($channelid)?0:$channelid); ?>)">移动</a>
+					<a class="btn btn-danger btn-sm" href="javascript:delArc(0)">删除</a>
+					<?php if($channelid==1) echo "<a class='btn btn-success btn-sm' href='javascript:kwArc(0)'>自动关键字</a>"; ?>
+					<a class="btn btn-success btn-sm" href="javascript:;" onClick="cAtts('attsAdd',event,this)">增加属性</a>
+					<a class="btn btn-danger btn-sm" href="javascript:;" onClick="cAtts('attsDel',event,this)">删除属性</a>
 				</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">
-			<tr bgcolor='#EEF4EA'>
-				<td background='images/wbg.gif' align='center'>
-					<table border='0' cellpadding='0' cellspacing='0' height="32">
 			<tr>
-							<td width='160'>
-								<select name='cid' style='width:150px'>
-									<option value='0'>选择栏目...</option>
-									{dede:global.optionarr /}
-								</select>
-							</td>
-							<td nowrap>
-								关键字：
-							</td>
-							<td width='130'>
-								<input type='text' name='keyword' value='{dede:global.keyword/}' style='width:120px' />
-							</td>
-							<td width='90'>
-								<select name='orderby' style='width:80px'>
-									<option value='id'>排序...</option>
-									<option value='pubdate'>更新时间</option>
-									<option value='sortrank'>置顶权值</option>
-									<option value='click'>点击量</option>
-									<option value='scores'>评论积分</option>
-									<option value='lastpost'>最后评论</option>
-								</select>
-							</td>
-							<td width='90'>
-								<select name='flag' style='width:80px'>
-									<option value=''>属性...</option>
-									{dede:global.flagsArr /}
-								</select>
-							</td>
-							<td>
-								<button type="submit" class="btn btn-success">搜索</button>
-							</td>
-						</tr>
-					</table>
-				</td>
+				<td height="36" colspan="10" align="center" style="background:#f2f2f2">{dede:pagelist listsize=6/}</td>
 			</tr>
 		</table>
 	</form>
-
 </body>
-
 </html>

src/dede/templets/desktop.ini

@@ -0,0 +1,2 @@
+[LocalizedFileNames]
+article_edit.htm=@article_edit.htm,0

src/dede/templets/diy_list.htm

@@ -1,77 +1,80 @@
-<!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><?php echo $diy->name;?></title>
+	<title><?php echo $diy->name; ?></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" />
+	<link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
+	<link rel="stylesheet" href="css/base.css">
 </head>
-
-<body background='images/allbg.gif' leftmargin='8' topmargin='8'>
+<body background="images/allbg.gif" leftmargin="8" topmargin="8">
 	<div class="bodytitle mt-3">
 		<div class="bodytitleleft"></div>
-		<div class="bodytitletxt" style="padding-left:10px;"><?php echo $diy->name;?>内容列表</div>
+		<div class="bodytitletxt" style="padding-left:10px;"><?php echo $diy->name; ?>列表</div>
 	</div>
 	<form action="diy_list.php" method="post">
-		<input type="hidden" name="diyid" value="<?php echo $diyid;?>" />
-		<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable"
-			style="background:#CFCFCF;">
+		<input type="hidden" name="diyid" value="<?php echo $diyid; ?>">
+		<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable" style="background:#CFCFCF">
 			<tr>
-				<td colspan="3" height="28" background='images/tbg.gif'>
-					<div style='float:left'>&nbsp;<a href='diy_main.php'><b>自定义表单管理</b></a> &gt; <b>内容列表</b></div>
-					<div style='float:right;padding-right:8px;'>
-						<a href="../plus/diy.php?action=list&diyid=<?php echo $diy->diyid; ?>" target="_blank"><img
-								src='images/gtk-tmp.png' align='left' title='预览' alt='预览' /><u>前台预览</u></a>
-					</div>
+				<td colspan="3" height="28" background="images/tbg.gif">
+					<div style="float:left"><a href="diy_main.php">自定义表单管理</a> &gt; <?php echo $diy->name; ?></div>
+					<div style="float:right;padding-right:10px"><a href="/plus/diy.php?action=list&diyid=<?php echo $diy->diyid; ?>" target="_blank"><img src="images/gtk-tmp.png" align="left" title="前台预览">前台预览</a></div>
 				</td>
 			</tr>
 			{dede:datalist}
 			<?php 
-if(!empty($fields))
-{
+			if(!empty($fields))
+			{
 				$allowhtml = array('htmltext');
-		$fields['sta'] = $fields['ifcheck'] == 1 ? '已审核' : '未审核';    
-		echo '<tr bgcolor="#F8FDE3"><td width="20%"><input type="checkbox" name="id[]" value="'.$fields['id'].'" class="np" />id</td><td><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'">'.$fields['id'].'</a> &nbsp; 状态: '.$fields['sta'].'</td><td width="10%" align="center"><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'"><img src="images/feedback-edit.gif" border="0" width="45" height="18"></a></td></tr>';
+				$fields['sta'] = $fields['ifcheck'] == 1 ?'已审核':'未审核';
+				echo '<tr bgcolor="#F8FDE3" height="28"><td width="18%"><input type="checkbox" name="id[]" value="'.$fields['id'].'" class="np"></td><td><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'">'.$fields['id'].'</a> '.$fields['sta'].'</td><td width="12%" align="center"><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'"><img src="images/feedback-edit.gif" border="0" width="46" height="18"></a></td></tr>';
 				foreach($fieldlist as $field=>$fielddata)
 				{
 					if($fields[$field]=='') continue;
-			if($fielddata[1]=='img')
-			{
-				$fields[$field] = "<a href='{$fields[$field]}' target='_blank'><img src='images/channeladd.gif' border='0' /> 图片附件</a>\r\n";
+					if($fielddata[1]=='img'){
+					$fields[$field] = "<a href='{$fields[$field]}' target='_blank'><img src='images/channeladd.gif' border='0'>图片附件</a>\r\n";
 					}
-			else if($fielddata[1]=='addon')
-			{
-				$fields[$field] = "<a href='{$fields[$field]}' target='_blank'><img src='images/channeladd.gif' border='0' /> 其它附件</a>";
-			}
-			else
-			{
+					else if($fielddata[1]=='addon'){
+					$fields[$field] = "<a href='{$fields[$field]}' target='_blank'><img src='images/channeladd.gif' border='0'>其它附件</a>";
+					} else {
 						if(!in_array($fielddata[1],$allowhtml)){
 							$fields[$field] = dede_htmlspecialchars($fields[$field]);
 						}
 					}
-			echo '<tr><td bgcolor="#ffffff" >'.$fielddata[0].'</td><td bgcolor="#ffffff" colspan="2">'.$fields[$field].'</td></tr>';		
+					echo '<tr height="28"><td bgcolor="#fff">'.$fielddata[0].'</td><td bgcolor="#fff" colspan="2">'.$fields[$field].'</td></tr>';
 				}
-} else {
-	echo "<tr><td bgcolor=\"#ffffff\">暂无记录</td></tr>";
-}
-?>
+			} else {
+				echo '<tr height="28"><td bgcolor="#fff">暂无记录</td></tr>';
+			}
+			?>
 			{/dede:datalist}
 			<tr>
-				<td colspan="3" bgcolor="#ffffff">{dede:pagelist listsize=5 /}</td>
+				<td colspan="3" bgcolor="#fff">{dede:pagelist listsize='8'/}</td>
 			</tr>
 			<tr>
-				<td colspan="3" height='36' align="center" bgcolor="#F8FCF1">
-					<label><input type="radio" name="action" value="check" class='np' /> 审核</label>
-					<label><input type="radio" name="action" value="delete" class='np' /> 删除</label>
-					&nbsp;&nbsp;
-					<button type="submit" name="submit" class='btn btn-success'>提交</button>
+				<td colspan="3" height="36" bgcolor="#F8FCF1">
+					<label><input type="button" name="select" onClick="selAll()" value="全选"></label>
+					<label><input type="button" name="select" onClick="noSelAll()" value="取消"></label>
+					<label><input type="radio" name="action" class="btn btn-success btn-sm" value="check">审核</label>
+					<label><input type="radio" name="action" class="btn btn-success btn-sm" value="delete">删除</label>
+					<label><input type="submit" name="submit" class="btn btn-success btn-sm" value="提交"></label>
 				</td>
 			</tr>
 		</table>
 	</form>
+	<script>
+	function selAll(){
+    	var a = document.getElementsByTagName("input");
+    	for (var i = 0; i < a.length; i++){
+        	if (a[i].type == "checkbox") a[i].checked = true;
+    	}
+	}
+	function noSelAll(){
+    	var a = document.getElementsByTagName("input");
+    	for (var i = 0; i < a.length; i++){
+        	if (a[i].type == "checkbox") a[i].checked = false;
+    	}
+	}
+	</script>
 </body>
-
 </html>

src/dede/templets/index2.htm

@@ -1,78 +1,28 @@
-<!--This is IE DTD patch , Don't delete this line.-->
-<!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">
-
+<!DOCTYPE html>
+<html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-  <title><?php echo $cfg_webname; ?>-<?php echo $cfg_softname." ".$cfg_version; ?></title>
-  <link href="css/frame.css" rel="stylesheet" type="text/css" />
-  <script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
-  <script src="js/frame.js" language="javascript" type="text/javascript"></script>
-  <link href="images/style<?php echo $cfg_admin_skin;?>/style.css" rel="stylesheet" type="text/css" />
-  <style type="text/css">
-    #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;
-    }
+    <meta charset="<?php echo $cfg_soft_lang; ?>">
+    <meta name="robots" content="noindex,nofollow">
+    <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)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>
@@ -80,52 +30,45 @@
         <div class="allmenu-box">
             <?php
             echo $mapstring;
-?>
-      <br style='clear:both' />
+            ?>
+            <br style="clear:both">
         </div>
     </div>
     <div class="head">
         <div class="top">
-      <div class="top_logo"> <img src="images/style<?php echo $cfg_admin_skin;?>/admin_top_logo.gif" width="200"
-          height="37" alt="DedeCMSV6 Logo" title="Welcome use DedeCMSV6" id="topdedelogo" /> </div>
-      <div class="top_version"
-        style="padding-top: 23px;font-weight: bolder;color: white;float: left;margin-left: -10px;font-style:italic;">v6
-      </div>
+            <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">您好：<?php echo $cuserLogin->getUserName(); ?> ，欢迎使用DedeCMSV6！</li>
-          <li><a href="index_menu.php" target="menu">主菜单</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','index_body.php');">系统主页</a></li>
+                    <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>
-          <li><a href="../member" target="_blank">会员中心</a></li>
-          <li><a href="exit.php" target="_top">注销</a></li>
                 </ul>
             </div>
         </div>
         <div class="topnav">
-      <div class="menuact"> <a href="#" id="togglemenu">隐藏菜单</a>
+            <div class="menuact">
+                <a href="#" id="togglemenu">隐藏菜单</a>
                 <?php
-			if($cuserLogin->getUserType() >= 10) echo '<a href="#" id="allmenu">功能地图</a>';
+                if($cuserLogin->getUserType()>=10) echo'<a href="#" id="allmenu">功能地图</a>';
                 ?>
             </div>
             <div id="skin">
-        <div>
-          
-  </div>
-
+                <div></div>
             </div>
-  <div class="nav" id="nav"> </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" style="width:150px;" />
-        <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>
+                        <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>
@@ -140,7 +83,6 @@
         <div class="main">
             <iframe id="main" name="main" frameborder="0" src="index_body.php"></iframe>
         </div>
-    <!--<div id="help"><span id="content"><a href="#">栏目管理操作使用说明</a></span></div>-->
     </div>
     <div class="qucikmenu" id="qucikmenu">
         <ul>
@@ -161,7 +103,7 @@
         ?>
         </ul>
     </div>
-  <script language="javascript">
+    <script>
     function JumpFrame(url1, url2) {
         jQuery('#menufra').get(0).src = url1;
         jQuery('#main').get(0).src = url2;
@@ -193,5 +135,4 @@
     })(jQuery);
     </script>
 </body>
-
 </html>

src/dede/templets/index_body.htm

@@ -1,28 +1,24 @@
-<!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>DedeCMSV6系统概况</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <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">
+    <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 !== '') {
@@ -37,72 +33,41 @@
     });
     </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>\r\n";
+                            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">
-                        Dede商业服务授权
+                    <div class="card-header">商业授权</div>
+                    <div class="card-body" id="_systeminfo">正在载入中...</div>
                 </div>
-                    <!--/.card-header-->
-                    <div class="card-body" id="_systeminfo">
-                        正在载入中...
-                    </div>
-                    <!--/.card-body-->
-                </div>
-                <!--/.card-->
             </div>
 
             <div class="col-md-6 mt-3">
                 <div class="card">
-                    <div class="card-header">
-                        快捷操作
-                        <a href='javascript:AddNew()'><b>【新增】</b></a>
-                        <a href='javascript:ListAll()'><b>【管理】</b></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
@@ -112,30 +77,24 @@
                             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 "总管理员";
@@ -145,69 +104,65 @@
                                     echo "信息采集员或其它管理员";
                                     }
                                     ?>
-                                    <a href="javascript:showMore()" class="btn btn-success btn-sm">查看更多</a></td>
+                                    <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>";
+                                                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> ";
+                                                        echo "<span class='btn btn-danger'>[{$k}×]</span> ";
                                                         $n++;
                                                     }
                                                 }
                                                 if($n==0) {
                                                     echo "符合要求";
                                                 } else {
-                                echo "被禁用的函数可能导致部份功能无法使用！";
+                                                    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>
@@ -215,38 +170,26 @@
                             </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
                             LEFT JOIN `#@__channeltype` ch ON ch.id = arc.channel
-                                 WHERE arc.arcrank<>-2 ORDER BY arc.id DESC LIMIT 0, 6 ";
+                            WHERE arc.arcrank<>-2 ORDER BY arc.id DESC LIMIT 0, 5";
                         $arcArr = array();
                         $dsql->Execute('m', $query);
                         while($row = $dsql->GetArray('m'))
@@ -263,90 +206,63 @@
                                 if(trim($row['editcon'])=='') {
                                     $row['editcon'] = 'archives_edit.php';
                                 }
-                                $linkstr = "·<a href='{$row['editcon']}?aid={$row['id']}&channelid={$row['channel']}'>{$row['title']}</a>";
-                                if($row['arcrank']==-1) $linkstr .= "<font color='red'>(未审核)</font>";
+                                $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>";
                             ?>
                             <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 {
                             ?>
                             <tr>
-                                <td class='nline' style="text-align:left">
-                                    暂无新增内容
-                                </td>
+                                <td class="nline" style="text-align:left">暂无新增内容</td>
                             </tr>
                         <?php
                         }
                         ?>
                         </table>
                     </div>
-                    <!--/.card-body-->
                 </div>
-                <!--/.card-->
             </div>
         </div>
     </div>
 
-
     <div class="footer">
-        <!-- //底部 -->
-        <div align="center" class="footer">
-            Copyright &copy; 2021 <a href='https://www.dedebiz.com' target='_blank'><u>DedeCMSV6</u></a>. 版权所有 <a
-                href="https://www.dedebiz.com" target="_blank" title="DedeBiz商业技术支持，提供更专业强大的站点应用开发技术">DedeBIZ技术支持</a>
-        </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:3px 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>
@@ -354,38 +270,33 @@
     </div>
 
     <script>
-
         var dedebizInfo;
-
         function ViewDedeBIZ() {
             console.log(dedebizInfo);
             ShowMsg(`
-            <table width="100%" class="table table-borderless"><tbody>
+            <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>
+                        <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>
+                        <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>
+                        <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>
+                        <td class="nline" style="text-align:left">内存占用：</td>
+                        <td class="nline" style="text-align:left">${dedebizInfo.result.server_memory_usage}% </td>
                     </tr>
-                        </tbody></table>
-            
+                </tbody>
+            </table>
             `);
         }
-
-        // 加载服务信息
+        //加载服务信息
         function LoadServer() {
             $.get("index_body.php?dopost=system_info", function (data) {
                 let rsp = JSON.parse(data);
@@ -394,66 +305,63 @@
                     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"> Dede商业组件： </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"> Dede商业组件： </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(`
-                    <div class="py-1">尚未启动Dede商业站点服务，原因：<b>${rsp.msg}</b></div>
-                    <div class="py-1">Dede商业服务可以提升性能、增强安全、支持开源。</div>
+                    <div class="py-1">尚未启动商业站点服务，原因：<b>${rsp.msg}</b></div>
+                    <div class="py-1">商业服务可以提升性能、增强安全、支持开源。</div>
                     <div class="py-1"><a class="btn btn-danger" target="_blank" href="<?php echo $cfg_biz_dedebizUrl;?>/start?code=${rsp.code}">开启商业服务</a></div>
                     `);
                 }
             });
         }
-
         $(document).ready(function () {
             LoadServer();
             setInterval(function () {
@@ -462,5 +370,4 @@
         });
     </script>
 </body>
-
 </html>

src/dede/templets/index_menu2.htm

@@ -2,174 +2,83 @@
 <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 {
-	padding:0;
-	margin:0
-}
-.sitemu a {
-	font-size:12px;
-	color:rgba(0,0,0,.65)
-}
-dl.bitem {
-	clear:both;
-	width:140;
-	margin:0 0 5px 12px;
-	background:url(images/menunewbg.gif) repeat-x
-}
-dl.bitem2 {
-	clear:both;
-	width:140;
-	margin:0 0 5px 12px;
-	background:url(images/menunewbg2.gif) repeat-x
-}
-dl.bitem dt,dl.bitem2 dt {
-	height:25px;
-	line-height:25px;
-	padding-left:35px;
-	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 {
-	padding-top:2px;
-	float:left
-}
-.sitemu li {
-	padding:2px 0 2px 18px;
-	line-height:22px;
-	background:url(images/arr4.gif) no-repeat 5px 9px
-}
-ul {
-	padding-top:6px
-}
-li {
-	height:22px
-}
-a.mmac div {
-	background:url(images/leftbg2.gif) no-repeat;
-	height:38px!important;
-	padding:8px 4px 4px 10;
-	word-wrap:break-word;
-	word-break:break-all;
-	font-weight:bold;
-	color:#325304
-}
-a.mm div {
-	background:url(images/leftmbg1.gif) no-repeat;
-	height:38px!important;
-	padding:8px 4px 4px 10;
-	word-wrap:break-word;
-	word-break:break-all;
-	font-weight:bold;
-	color:#475645;
-	cursor:pointer
-}
-a.mm:hover div {
-	background:url(images/leftbg2.gif) no-repeat;
-	color:#4F7632
-}
-.mmf {
-	height:1px;
-	padding:5px 7px 5px 7px
-}
-#mainct {
-	padding-top:8px;
-	background:url(images/idnbg1.gif) repeat-y
-}
+body{margin:0;background:#f2f2f2;padding-left:8px;overflow:scroll;overflow-x:hidden}
+img{margin-right:0}
+div{margin:0;padding:0}
+dl.bitem{margin:0 0 0 10px;width:140px;background:url(images/menunewbg.gif)repeat-x;clear:both}
+dl.bitem2{margin:0 0 0 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:#ffffff}
+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;">
+	<table width="180" align="left" cellspacing="0" cellpadding="0">
 		<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) {
+				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
 				}
 				?>
-				<div class='mmf'></div>
+				<div class="mmf"></div>
 			</td>
-			<td width='160' id='mainct' valign="top">
-				<div id='ct1'>
+			<td width="160" id="mainct" valign="top">
+				<div id="ct1">
 				<?php
-GetMenus($cuserLogin->getUserRank(), 'main');
-?>
+				GetMenus($cuserLogin->getUserRank(),'main');
+				?>
 				</div>
-				<div id='ct100'></div>
-				<div id='ct3'></div>
-				<div id='ct5'></div>
-				<div id='ct6'></div>
-				<div id='ct7'></div>
-				<div id='ct20'></div>
-				<div id='ct10'></div>
+				<div id="ct100"></div>
+				<div id="ct3"></div>
+				<div id="ct5"></div>
+				<div id="ct6"></div>
+				<div id="ct7"></div>
+				<div id="ct20"></div>
+				<div id="ct10"></div>
 			</td>
 		</tr>
 		<tr>
-			<td width='26'></td>
-			<td width='160' valign='top'><img src='images/idnbgfoot.gif' /></td>
+			<td width="26"></td>
+			<td width="160" valign="top"><img src='images/idnbgfoot.gif'></td>
 		</tr>
 	</table>
 	<?php
-if(!empty($openitem) && $openitem!=1)
-{
-?>
-	<script language='javascript'>
+	if(!empty($openitem) && $openitem!=1)
+	{
+	?>
+	<script>
 	ShowMainMenu(100);
 	</script>
 	<?php
-}
-?>
-	<script language="javascript">
-		function myAlert() {
-			alert('dede');
 	}
-	</script>
+	?>
 </body>
-
 </html>

src/dede/templets/index_top2.htm

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>dedecms</title>
+<title>DedeBIZ</title>
 <link href="css/base.css" rel="stylesheet" type="text/css">
 <script language='javascript'>
 var preFrameW = '206,*';
@@ -124,7 +124,7 @@ a:link,a:visited {
 <body bgColor='#ffffff'>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" background="../static/topbg2.gif">
   <tr>
-    <td width='20%'><img src="images/df_dedetitle2.gif" alt="dedecms logo" title="dedecms logo" /></td>
+    <td width='20%'><img src="images/df_dedetitle2.gif" alt="DedeBIZ logo" title="DedeBIZ logo" /></td>
     <td width='80%'>
      <div id='rpart'>
      	<dl id="tpa">
@@ -142,7 +142,7 @@ a:link,a:visited {
 			</dl>
      </div>
      <div id='lpart'>
-     	您好：<span class="username"><?php echo $cuserLogin->getUserName(); ?> </span>，欢迎使用DedeCMSV6！
+     	您好：<span class="username"><?php echo $cuserLogin->getUserName(); ?> </span>，欢迎使用DedeBIZV6！
      </div>
     </td>
   </tr>

src/dede/templets/login.htm

@@ -1,81 +1,46 @@
-<!doctype html>
-<html lang="zh-CN">
-
+<!DOCTYPE html>
+<html>
 <head>
 	<meta charset="<?php echo $cfg_soft_lang; ?>">
-	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+	<meta name="robots" content="noindex,nofollow">
+	<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_softname." ".$cfg_version; ?></title>
+	<title><?php echo $cfg_webname; ?>后台登录</title>
 	<style>
-		body {
-			background-color: #F5F5F5;
-			font-size: 13px;
-		}
-
-		header {
-			background-color: white;
-		}
-
-		header .logo {
-			width: 260px;
-			padding: 1em 0;
-		}
-
-		.login-from {
-			max-width: 680px;
-			width: 100%;
-		}
-
-		.login-area {
-			background-color: white;
-			padding: 1em;
-		}
-
-		.login-area .btnLogin {
-			width: 100%;
-		}
-
-		.login-power {
-			padding: 1em 0;
-		}
-
-		.login-power a,
-		.goindex a {
-			color: #3DB058;
-		}
-
-		.goindex {
-			line-height: 65px;
-		}
+body{font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;background:#f2f2f2}
+header{background:#ffffff}
+header .logo{width:260px;padding:1em 0}
+.login-from{max-width:580px;width:100%}
+.login-area{background:#ffffff;padding:2em;border-radius:.25rem}
+.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=""></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>
-
 	</header>
-
-	<main class="container login-from mt-3">
-		<div class="alert alert-warning" role="alert">
+	<main class="container login-from mt-5">
 		<?php echo $redmsg; ?>
-		</div>
-
 		<div class="login-area">
-			<h2 class="text-center">管理目录</h2>
+			<h3 class="mb-3 text-center">后台登录</h3>
 			<form name="form1" method="post" action="login.php">
-				<input type="hidden" name="gotopage" value="<?php if(!empty($gotopage)) echo RemoveXSS($gotopage);?>" />
-				<input type="hidden" name="dopost" value="login" />
-				<input name='adminstyle' type='hidden' value='newdedecms' />
+				<input type="hidden" name="gotopage" value="<?php if(!empty($gotopage)) echo RemoveXSS($gotopage); ?>">
+				<input type="hidden" name="dopost" value="login">
+				<input type="hidden" name="adminstyle" value="newDedeBIZ">
 				<div class="form-group">
 					<label for="iptUserid">用户名</label>
 					<input type="text" name="userid" class="form-control" id="iptUserid">
@@ -84,26 +49,26 @@
 					<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="点击我更换图片" alt="点击我更换图片" />
+						<input type="text" name="validate" class="form-control" id="iptValidate" style="text-transform:uppercase">
+						<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"> Powered by<a href="http://www.dedebiz.com" title="DedeBIZ官网"><strong>
-							DedeCMS<?php echo $cfg_version; ?></strong></a>&copy; 2021 <a href="https://www.dedebiz.com"
-						target="_blank" title="DedeBiz商业技术支持，提供更专业强大的站点应用开发技术">DedeBiz技术支持</a></div>
+				<div class="login-power"><?php echo $cfg_powerby; ?></div>
 			</form>
 		</div>
 	</main>
-
 	<script src="../static/js/jquery.min.js"></script>
 	<script src="../static/js/bootstrap.bundle.js"></script>
 </body>
-
 </html>

src/dede/templets/makehtml_homepage.htm

@@ -51,7 +51,7 @@
         <td height="20" colspan="2" valign="top" bgcolor="#FFFFFF">
           默认的情况下，生成的主页文件放在CMS的安装目录，如果您的CMS不是安装在网站根目录的，又想把主页创建到网站根目录，那么请用相对路径来表示“主页位置”。<br />
           例：您的CMS安装在
-          http://www.abc.com/dedecms/ 目录，您想生成的主页为 http://www.abc.com/index.html，那么主页位置就应该用：
+          http://www.abc.com/DedeBIZ/ 目录，您想生成的主页为 http://www.abc.com/index.html，那么主页位置就应该用：
           “../index.html”。</td>
       </tr>
       <tr>

src/dede/templets/module_help.htm

@@ -65,7 +65,7 @@
             <td><a href="#3">3、开发模块安装程序和卸载的注意事项。</a></td>
           </tr>
           <tr>
-            <td><a href="#4">4、DedeCMSV6的后台管理程序的开发注意事项。</a></td>
+            <td><a href="#4">4、DedeBIZV6的后台管理程序的开发注意事项。</a></td>
           </tr>
         </table>
       </td>
@@ -91,7 +91,7 @@
       <td height="100" bgcolor="#FFFFFF">&nbsp;</td>
     </tr>
     <tr>
-      <td bgcolor="#FFFFFF"><strong>4、Dedecms的后台管理程序的开发注意事项。<a name="4" id="4"></a></strong></td>
+      <td bgcolor="#FFFFFF"><strong>4、DedeBIZ的后台管理程序的开发注意事项。<a name="4" id="4"></a></strong></td>
     </tr>
 
     <tr>

src/dede/templets/module_main.htm

@@ -33,7 +33,7 @@
     </div>
   </div>
   <div class="alert alert-info maintable mb-2" role="alert" style="margin: 0 auto;">
-    从DedeCMSV6开始，启动了<a href="<?php echo $cfg_biz_dedebizUrl;?>/license_developer" target="_blank">DedeBIZ商业开发者计划</a>，为了保障系统及技术服务安全，请认准DedeBIZ商业认证开发者。
+    从DedeBIZV6开始，启动了<a href="<?php echo $cfg_biz_dedebizUrl;?>/license_developer" target="_blank">DedeBIZ商业开发者计划</a>，为了保障系统及技术服务安全，请认准DedeBIZ商业认证开发者。
   </div>
   <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable"
     style="background:#CFCFCF;">

src/dede/templets/sys_data.htm

@@ -105,7 +105,7 @@
     <form name="form1" onSubmit="checkSubmit()" action="sys_data_done.php?dopost=bak" method="post" target="stafrm">
       <input type='hidden' name='tablearr' value='' />
       <tr bgcolor="#F7F8ED">
-        <td height="24" colspan="8"><strong>DedeCMSV6默认系统表：</strong></td>
+        <td height="24" colspan="8"><strong>DedeBIZV6默认系统表：</strong></td>
       </tr>
       <tr bgcolor="#FBFCE2" align="center">
         <td height="24" width="5%">选择</td>

src/dede/templets/sys_info.htm

@@ -60,7 +60,7 @@
     <table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D6D6D6" align="center"
       class="table maintable table-bordered mt-3">
       <tr>
-        <td height="28" background="images/tbg.gif" style="padding-left:10px;"><b>DedeCMSV6系统配置参数：</b></td>
+        <td height="28" background="images/tbg.gif" style="padding-left:10px;"><b>DedeBIZV6系统配置参数：</b></td>
       </tr>
       <tr>
         <td height="24" bgcolor="#ffffff" align="center"><?php

src/dede/templets/sys_info_mark.htm

@@ -18,7 +18,7 @@
       <input type="hidden" name="get_photo_markimg" value="<?php echo $photo_markimg?>">
       <tr>
         <td height="26" colspan="2" bgcolor="#FFFFFF" background="images/tbg.gif" style="padding-left:10px;">
-          <b>DedeCMSV6系统配置参数</b> - <strong>图片水印设置</strong> </td>
+          <b>DedeBIZV6系统配置参数</b> - <strong>图片水印设置</strong> </td>
       </tr>
       <tr bgcolor="#FFFFFF">
         <td width="41%" height="24">上传的图片是否使用图片水印功能：<br> </td>

src/dede/templets/templets_default.htm

@@ -1,29 +1,19 @@
-<!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;
+		if (window.confirm('你确定要删除这篇文档吗')) location = 'tpl.php?action=del&acdir=<?php echo $acdir; ?>&filename=' + filename;
 		else return false;
 	}
 	</script>
@@ -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>
 				</div>
 				<div style='float:right;padding-right:10px'>
 					<a class="btn btn-success btn-sm" href='templets_main.php'>默认模板目录</a>
@@ -64,27 +52,20 @@
 			</td>
 		</tr>
 		<?php
-   $dh = dir($templetdird);
-   while($filename=$dh->read())
-   {
-   	  if(!preg_match("#\.htm#", $filename)) continue;
+		$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>
-				<a href='<?php echo $templeturld.'/'.$filename; ?>' target='_blank'>
-					<img src='images/htm.gif' border='0' align='absmiddle' /> <?php echo $filename; ?>
-				</a>
-			</td>
+		<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
@@ -98,17 +79,12 @@
 				?>
 			</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/dede/templets/winmode.htm

@@ -13,7 +13,7 @@
     style="BORDER-COLLAPSE: collapse">
     <tr>
       <td width="100%" height="64" background="images/indextitlebg.gif">
-        <img src="images/indextitle.gif" width="250" height="64" alt="Power by DedeCMSV6 OX">
+        <img src="images/indextitle.gif" width="250" height="64" alt="Power by DedeBIZV6 OX">
       </td>
     </tr>
     <tr>

src/dede/testenv.php

@@ -268,7 +268,7 @@ $action = isset($action) ? $action : '';
 		<dl style="margin-left:0.5%;margin-right:0.5%; width:97%" id="item1" class="dbox">
 			<dt class="lside"><span class="l" style="float:left">系统运行目录权限检测</span><span style="float:right; margin-right:20px"><a href="index_body.php">返回主页</a></span><span style="float:right; margin-right:20px"><a href="https://www.dedebiz.com/help" target="_blank">帮助说明</a></span></dt>
 			<dd>
-				<div style="padding:10px"> 说明：本程序用于检测DedeCMSV6站点所涉及的目录权限，并且提供一个全面的检测说明，您可以根据检测报告来配置站点以保证站点更为安全。</div>
+				<div style="padding:10px"> 说明：本程序用于检测DedeBIZ站点所涉及的目录权限，并且提供一个全面的检测说明，您可以根据检测报告来配置站点以保证站点更为安全。</div>
 				<div id="tableHeader" style="margin-left:10px">
 					<table width="784" border="0" cellpadding="0" cellspacing="1" bgcolor="#047700" id="scanTable">
 						<thead>

src/dede/tpl.php

@@ -152,7 +152,7 @@ function _upload() {}
         exit();
     } else {
         if (!preg_match("#\.(htm|html)$#", $upfile_name)) {
-            ShowMsg("DedeCMSV6模板只能用 .htm 或 .html扩展名！", "-1");
+            ShowMsg("DedeBIZ模板只能用 .htm 或 .html扩展名！", "-1");
             exit();
         }
         if (preg_match("#[\\\\\/]#", $upfile_name)) {

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,7 +259,6 @@ function IndexActive($idx)
         return '';
     }
 }
-
 // 自定义函数接口
 // 这里主要兼容早期的用户扩展,v5.7之后我们建议使用小助手helper进行扩展
 if (file_exists(DEDEINC . '/extend.func.php')) {

src/include/common.inc.php

@@ -242,7 +242,7 @@ $cfg_soft_lang = 'utf-8';
 $cfg_soft_public = 'base';
 
 $cfg_softname = '织梦内容管理系统';
-$cfg_soft_enname = 'DedeCMSV6';
+$cfg_soft_enname = 'DedeBIZ';
 $cfg_soft_devteam = 'DedeBIZ';
 
 //文档的默认命名规则

src/include/helpers/charset.helper.php

@@ -1,6 +1,6 @@
 <?php if (!defined('DEDEINC')) exit('dedebiz');
 /**
- * DedeCMSV6中用到的字符编码转换的小助手函数
+ * DedeBIZV6中用到的字符编码转换的小助手函数
  *
  * @version        $Id: charset.helper.php 1 2010-07-05 11:43:09Z tianya $
  * @package        DedeBIZ.Helpers

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,14 +106,12 @@ 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);

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);

src/include/taglib/flinktype.lib.php

@@ -39,10 +39,10 @@ function lib_flinktype(&$ctag, &$refObj)
     while ($dbrow = $dsql->GetObject()) {
         $row[] = $dbrow;
     }
-    $dedecms = new stdClass;
-    $dedecms->id = 999;
-    $dedecms->typename = '织梦链';
-    if ($type == 'dedecms') $row[] = $dedecms;
+    $DedeBIZ = new stdClass;
+    $DedeBIZ->id = 999;
+    $DedeBIZ->typename = '织梦链';
+    if ($type == 'DedeBIZ') $row[] = $DedeBIZ;
 
     foreach ($row as $key => $value) {
         if (is_array($dtp->CTags)) {

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);

src/include/userlogin.class.php

@@ -182,7 +182,7 @@ class userLogin
     var $keepUserNameTag = 'dede_admin_name';
     var $keepUserPurviewTag = 'dede_admin_purview';
     var $keepAdminStyleTag = 'dede_admin_style';
-    var $adminStyle = 'dedecms';
+    var $adminStyle = 'DedeBIZ';
 
     //php5构造函数
     function __construct($admindir = '')
@@ -257,7 +257,7 @@ class userLogin
     {
         if ($this->userID != '' && $this->userType != '') {
             global $admincachefile, $adminstyle;
-            if (empty($adminstyle)) $adminstyle = 'dedecms';
+            if (empty($adminstyle)) $adminstyle = 'DedeBIZ';
 
             @session_register($this->keepUserIDTag);
             $_SESSION[$this->keepUserIDTag] = $this->userID;

src/install/index.php

@@ -11,7 +11,7 @@
 error_reporting(E_ALL || ~E_NOTICE);
 
 $verMsg = 'V6';
-$dfDbname = 'dedecmsv6';
+$dfDbname = 'DedeBIZ';
 $cfg_version_detail = '6.0.3'; // 详细版本号
 $errmsg = '';
 

src/install/sql-dfdata.txt

@@ -513,7 +513,7 @@ INSERT INTO `#@__co_onepage` VALUES('5','www.dedebiz.com','DedeBIZ','1','gb2312'
 ('4','www.techweb.com.cn','Techweb','1','gb2312','<div class="content_txt">{@body}</div>\t\n'),
 ('6','tw.news.yahoo.com','台湾雅虎','1','big5','<div id="ynwsartcontent">{@body}</div>\t\n');
 
-INSERT INTO `#@__flink` (`sortrank`, `url`, `webname`, `msg`, `email`, `logo`, `dtime`, `typeid`, `ischeck`) VALUES (1, 'https://www.dedebiz.com', 'DedeCMSV6', '', '', '', 1226375403, 1, 2);
+INSERT INTO `#@__flink` (`sortrank`, `url`, `webname`, `msg`, `email`, `logo`, `dtime`, `typeid`, `ischeck`) VALUES (1, 'https://www.dedebiz.com', 'DedeBIZ', '', '', '', 1226375403, 1, 2);
 INSERT INTO `#@__flink` (`sortrank`, `url`, `webname`, `msg`, `email`, `logo`, `dtime`, `typeid`, `ischeck`) VALUES (1, 'https://www.dedebiz.com/help', '帮助中心', '', '', '', 1227772717, 1, 2);
 INSERT INTO `#@__flink` (`sortrank`, `url`, `webname`, `msg`, `email`, `logo`, `dtime`, `typeid`, `ischeck`) VALUES (1, 'https://www.dedebiz.com/auth', '授权中心', '', '', '', 1227772703, 1, 2);
 INSERT INTO `#@__flink` (`sortrank`, `url`, `webname`, `msg`, `email`, `logo`, `dtime`, `typeid`, `ischeck`) VALUES (3, 'https://www.dedebiz.com/git', '代码托管', '', '', '', 1603767210, 1, 1);

src/install/templates/step-1.html

@@ -4,7 +4,7 @@
 
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>安装程序 - DedeCMSV6 - DedeBIZ技术支持
+	<title>安装程序 - DedeBIZ - DedeBIZ技术支持
 	</title>
 	<link rel="stylesheet" href="../static/css/bootstrap.min.css">
 	<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
@@ -16,7 +16,7 @@
 
 <body>
 	<div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-3 bg-white border-bottom shadow-sm">
-		<h5 class="my-0 mr-md-auto font-weight-normal text-success">DedeCMSV6安装程序</h5>
+		<h5 class="my-0 mr-md-auto font-weight-normal text-success">DedeBIZ安装程序</h5>
 		<nav class="my-2 my-md-0 mr-md-3">
 			<a class="p-2 text-dark" href="https://www.dedebiz.com/git" target="_blank">代码托管</a>
 			<a class="p-2 text-dark" href="https://www.dedebiz.com/help" target="_blank">帮助中心</a>
@@ -76,7 +76,7 @@
 					<div class="mb-3">
 						<label for="dbname" class="form-label">数据库名称</label>
 						<div class="input-group mb-3">
-							<input id="dbname" name="dbname" type="text" class="form-control" placeholder="dedecmsv6">
+							<input id="dbname" name="dbname" type="text" class="form-control" placeholder="DedeBIZ">
 							<div class="input-group-append">
 								<button class="btn btn-outline-success" type="button" id="btnCheckConnect">检查连接</button>
 							</div>

src/member/index_do.php

@@ -33,7 +33,7 @@ if ($fmdo == 'sendMail') {
     $mailbody .= "欢迎注册成为[{$cfg_webname}]的会员。\r\n";
     $mailbody .= "要通过注册，还必须进行最后一步操作，请点击或复制下面链接到地址栏访问这地址：\r\n\r\n";
     $mailbody .= "{$url}\r\n\r\n";
-    $mailbody .= "Power by https://www.dedebiz.com DedeCMSV6内容管理系统\r\n";
+    $mailbody .= "Power by https://www.dedebiz.com DedeBIZ内容管理系统\r\n";
 
     $headers = "From: " . $cfg_adminemail . "\r\nReply-To: " . $cfg_adminemail;
 

src/member/templets/footer.htm

@@ -1,7 +1,7 @@
 <footer class="bg-success">
     <div class="copyright py-5">
         <p class="text-center">
-            Powered by <a href="https://www.dedebiz.com" title="DedeCMSV6内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeCMS<?php echo $cfg_version;?></strong></a> &copy; 2021 <a href="https://www.dedebiz.com" target="_blank" title="DedeBIZ商业技术支持，提供更专业强大的站点应用开发技术">DedeBIZ技术支持</a><br />
+            Powered by <a href="https://www.dedebiz.com" title="DedeBIZ内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeCMS<?php echo $cfg_version;?></strong></a> &copy; 2021 <a href="https://www.dedebiz.com" target="_blank" title="DedeBIZ商业技术支持，提供更专业强大的站点应用开发技术">DedeBIZ技术支持</a><br />
             <?php echo $cfg_powerby;?>&nbsp;&nbsp;<?php echo $cfg_beian;?>
         </p>
     </div>

src/plus/diy.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  *
  * 自定义表单
@@ -11,19 +10,15 @@
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__) . "/../include/common.inc.php");
-
 $diyid = isset($diyid) && is_numeric($diyid) ? $diyid : 0;
 $action = isset($action) && in_array($action, array('post', 'list', 'view')) ? $action : 'post';
 $id = isset($id) && is_numeric($id) ? $id : 0;
-
 if (empty($diyid)) {
     showMsg('非法操作!', 'javascript:;');
     exit();
 }
-
 require_once DEDEINC . '/diyform.cls.php';
 $diy = new diyform($diyid);
-
 /*----------------------------
 function Post(){ }
 ---------------------------*/
@@ -46,11 +41,8 @@ if ($action == 'post') {
             showmsg('自定义表单不存在', '-1');
             exit();
         }
-
         $addvar = $addvalue = '';
-
         if (!empty($dede_fields)) {
-
             $fieldarr = explode(';', $dede_fields);
             if (is_array($fieldarr)) {
                 foreach ($fieldarr as $field) {
@@ -59,34 +51,45 @@ if ($action == 'post') {
                     if ($fieldinfo[1] == 'textdata') {
                         ${$fieldinfo[0]} = FilterSearch(stripslashes(${$fieldinfo[0]}));
                         ${$fieldinfo[0]} = addslashes(${$fieldinfo[0]});
+                    } 
+                    //获取地址，表单添加text数据类型ip字段型后模板用<input type="hidden" name="ip" value="">
+                    if($fieldinfo[0] == 'ip')
+                    {
+                        ${$fieldinfo[0]}=GetIP();
+                    }
+                    //获取时间，表单添加text数据类型sj字段型后模板用<input type="hidden" name="sj" value="">
+                    if($fieldinfo[0] == 'sj')
+                    {
+                        ${$fieldinfo[0]}=date("Y-m-d H:i");
                     } else {
-                        ${$fieldinfo[0]} = GetFieldValue(${$fieldinfo[0]}, $fieldinfo[1], 0, 'add', '', 'diy', $fieldinfo[0]);
+                        ${$fieldinfo[0]} = GetFieldValue(${$fieldinfo[0]}, $fieldinfo[1],0,'add','','diy', $fieldinfo[0]);
                     }
                     $addvar .= ', `' . $fieldinfo[0] . '`';
                     $addvalue .= ", '" . ${$fieldinfo[0]} . "'";
                 }
             }
         }
-
         $query = "INSERT INTO `{$diy->table}` (`id`, `ifcheck` $addvar) VALUES (NULL, 0 $addvalue); ";
-
         if ($dsql->ExecuteNoneQuery($query)) {
             $id = $dsql->GetLastID();
-            if ($diy->public == 2) {
-                //diy.php?action=view&diyid={$diy->diyid}&id=$id
+            if ($diy->public == 2)
+            {
                 $goto = "diy.php?action=list&diyid={$diy->diyid}";
-                $bkmsg = '发布成功，现在转向表单列表页...';
+                $bkmsg = '发布成功，现在转向表单列表页';
             } else {
                 $goto = !empty($cfg_cmspath) ? $cfg_cmspath : '/';
-                $bkmsg = '发布成功，请等待管理员处理...';
+                $bkmsg = '发布成功，请等待管理员处理';
+                //提交后返回提交页面
+                echo"<script>alert('提交成功');history.go(-1)</script>";
             }
-            ShowMsg($bkmsg, $goto);
+            showmsg($bkmsg, $goto);
         }
     }
 }
 /*----------------------------
 function list(){ }
----------------------------*/ else if ($action == 'list') {
+---------------------------*/
+else if ($action == 'list') {
     if (empty($diy->public)) {
         ShowMsg('后台关闭前台浏览', 'javascript:;');
         exit();
@@ -96,7 +99,6 @@ function list(){ }
         $query = "SELECT * FROM `{$diy->table}` ORDER BY id DESC";
     else
         $query = "SELECT * FROM `{$diy->table}` WHERE ifcheck=1 ORDER BY id DESC";
-
     $datalist = new DataListCP();
     $datalist->pageSize = 10;
     $datalist->SetParameter('action', 'list');
@@ -110,7 +112,6 @@ function list(){ }
         showMsg('后台关闭前台浏览', 'javascript:;');
         exit();
     }
-
     if (empty($id)) {
         showMsg('非法操作！未指定id', 'javascript:;');
         exit();
@@ -126,7 +127,6 @@ function list(){ }
         showmsg('你访问的记录不存在或未经审核', '-1');
         exit();
     }
-
     $fieldlist = $diy->getFieldList();
     include DEDEROOT . "/templets/plus/{$diy->viewTemplate}";
 }

src/plus/recommend.php

@@ -44,7 +44,7 @@ else if ($action == 'send') {
     $msg = RemoveXSS(dede_htmlspecialchars($msg));
     $mailtitle = "你的好友给你推荐了一篇文章";
     $mailbody .= "$msg \r\n\r\n";
-    $mailbody .= "Powered by https://www.dedebiz.com DedeCMSV6内容管理系统！";
+    $mailbody .= "Powered by https://www.dedebiz.com DedeBIZ内容管理系统！";
 
     $headers = "From: " . $cfg_adminemail . "\r\nReply-To: " . $cfg_adminemail;
     if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) {

src/static/ckeditor/config.js

@@ -9,9 +9,9 @@ CKEDITOR.editorConfig = function (config) {
 		{ name: 'clipboard', groups: ['clipboard', 'undo'] },
 		{ name: 'editing', groups: ['find', 'selection', 'spellchecker', 'editing'] },
 		{ name: 'forms', groups: ['forms'] },
+		{ name: 'basicstyles', groups: ['basicstyles', 'cleanup', 'list', 'indent', 'blocks'] },
 		'/',
-		{ name: 'basicstyles', groups: ['basicstyles', 'cleanup'] },
-		{ name: 'paragraph', groups: ['list', 'indent', 'blocks', 'align', 'bidi', 'paragraph','textindent'] },
+		{ name: 'paragraph', groups: ['align', 'bidi', 'paragraph','textindent'] },
 		{ name: 'links', groups: ['links'] },
 		{ name: 'insert', groups: ['insert'] },
 		'/',

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}

src/templets/default/advancedsearch.htm

@@ -167,7 +167,7 @@ $fields['typeurl'] = GetTypeUrl($fields['typeid'],MfTypedir($fields['typedir']),
 
 
 <div class="footer cbox">
-	Powered by <a href="https://www.dedebiz.com" title="DedeCMSV6内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeCMS{dede:global name='cfg_version'/}</strong></a> &copy; 2021 <a href="https://www.dedebiz.com/" target="_blank">DedeBIZ</a> Inc.<br /><div class="copyright">{dede:global name='cfg_powerby'/}&nbsp;&nbsp;{dede:global name='cfg_beian'/}</div></p>        
+	Powered by <a href="https://www.dedebiz.com" title="DedeBIZ内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeBIZ{dede:global name='cfg_version'/}</strong></a> &copy; 2021 <a href="https://www.dedebiz.com/" target="_blank">DedeBIZ</a> Inc.<br /><div class="copyright">{dede:global name='cfg_powerby'/}&nbsp;&nbsp;{dede:global name='cfg_beian'/}</div></p>        
 </div>
 
 </body>

src/templets/default/footer.htm

@@ -1,7 +1,7 @@
 <footer class="bg-success">
     <div class="copyright py-5">
         <p class="text-center">
-            Powered by <a href="https://www.dedebiz.com" title="DedeCMSV6内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeCMS{dede:global.cfg_version/}</strong></a> &copy; 2021 <a href="https://www.dedebiz.com" target="_blank" title="DedeBIZ商业技术支持，提供更专业强大的站点应用开发技术">DedeBIZ技术支持</a><br />
+            Powered by <a href="https://www.dedebiz.com" title="DedeBIZ内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeBIZ{dede:global.cfg_version/}</strong></a> &copy; 2021 <a href="https://www.dedebiz.com" target="_blank" title="DedeBIZ商业技术支持，提供更专业强大的站点应用开发技术">DedeBIZ技术支持</a><br />
             {dede:global.cfg_powerby/}&nbsp;&nbsp;{dede:global.cfg_beian/}
         </p>
     </div>

src/templets/plus/plus_footer.htm

@@ -1,7 +1,7 @@
 <footer class="bg-success mt-3">
     <div class="copyright py-5">
         <p class="text-center">
-            Powered by <a href="https://www.dedebiz.com" title="DedeCMSV6内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeCMS<?php echo $cfg_version;?></strong></a> &copy; 2021 <a href="https://www.dedebiz.com" target="_blank" title="DedeBIZ商业技术支持，提供更专业强大的站点应用开发技术">DedeBIZ技术支持</a><br />
+            Powered by <a href="https://www.dedebiz.com" title="DedeBIZ内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeBIZ<?php echo $cfg_version;?></strong></a> &copy; 2021 <a href="https://www.dedebiz.com" target="_blank" title="DedeBIZ商业技术支持，提供更专业强大的站点应用开发技术">DedeBIZ技术支持</a><br />
             <?php echo $cfg_powerby;?>&nbsp;&nbsp;<?php echo $cfg_beian;?>
         </p>
     </div>

src/templets/plus/rssmap.htm

@@ -33,7 +33,7 @@
     <div class="footer_left"></div>
     <div class="footer_body">
 	<p class="powered">    
-		Powered by <a href="https://www.dedebiz.com" title="DedeCMSV6内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeCMS{dede:global name='cfg_version'/}</strong></a> &copy; 2021 <a href="https://www.dedebiz.com/" target="_blank">DedeBIZ</a> Inc.<br /><div class="copyright">{dede:global name='cfg_powerby'/}&nbsp;&nbsp;{dede:global name='cfg_beian'/}</div></p>        
+		Powered by <a href="https://www.dedebiz.com" title="DedeBIZ内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeBIZ{dede:global name='cfg_version'/}</strong></a> &copy; 2021 <a href="https://www.dedebiz.com/" target="_blank">DedeBIZ</a> Inc.<br /><div class="copyright">{dede:global name='cfg_powerby'/}&nbsp;&nbsp;{dede:global name='cfg_beian'/}</div></p>        
    </div>
    <div class="footer_right"></div>
 </div>

src/templets/plus/sitemap.htm

@@ -32,7 +32,7 @@
     <div class="footer_left"></div>
     <div class="footer_body">
 	<p class="powered">    
-		Powered by <a href="https://www.dedebiz.com" title="DedeCMSV6内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeCMS{dede:global name='cfg_version'/}</strong></a> &copy; 2021 <a href="https://www.dedebiz.com/" target="_blank">DedeBIZ</a> Inc.<br /><div class="copyright">{dede:global name='cfg_powerby'/}&nbsp;&nbsp;{dede:global name='cfg_beian'/}</div></p>        
+		Powered by <a href="https://www.dedebiz.com" title="DedeBIZ内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeBIZ{dede:global name='cfg_version'/}</strong></a> &copy; 2021 <a href="https://www.dedebiz.com/" target="_blank">DedeBIZ</a> Inc.<br /><div class="copyright">{dede:global name='cfg_powerby'/}&nbsp;&nbsp;{dede:global name='cfg_beian'/}</div></p>        
    </div>
    <div class="footer_right"></div>
 </div>

src/templets/plus/view_diyform.htm

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
-<title><?php echo $diy->name;?> - powered by dedecms</title>
+<title><?php echo $diy->name;?> - powered by dedebiz</title>
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/css/bootstrap.min.css">
 <link href="<?php echo $cfg_cmsurl;?>/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">

src/templets/plus/view_msg_catalog.htm

@@ -61,7 +61,7 @@
     <div class="footer_body">
     <span class="gotop"><a href="javascript:scroll(0,0)"><img src="<?php echo $cfg_templets_skin; ?>/images/top.gif" height="11" width="61" alt="返回顶部"/></a></span>
 	<p class="powered">    
-		Powered by <a href="https://www.dedebiz.com" title="DedeCMSV6内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeCMS{dede:global name='cfg_version'/}</strong></a> &copy; 2021 <a href="https://www.dedebiz.com/" target="_blank">DedeBIZ</a> Inc.<br /><div class="copyright">{dede:global name='cfg_powerby'/}&nbsp;&nbsp;{dede:global name='cfg_beian'/}</div></p>        
+		Powered by <a href="https://www.dedebiz.com" title="DedeBIZ内容管理系统-国内流行的内容管理系统（CMS）多端全媒体解决方案。" target="_blank"><strong>DedeBIZ{dede:global name='cfg_version'/}</strong></a> &copy; 2021 <a href="https://www.dedebiz.com/" target="_blank">DedeBIZ</a> Inc.<br /><div class="copyright">{dede:global name='cfg_powerby'/}&nbsp;&nbsp;{dede:global name='cfg_beian'/}</div></p>        
    </div>
    <div class="footer_right"></div>
 </div>