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

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,166 @@
 td {
-    padding: 3px 0px 0 3px;
+    padding:3px 0px 0 3px
 }
-
 .title {
-    color: #666600;
-    font-weight: bold;
+    color:#666600;
+    font-weight:bold
 }
-
 .title span {
-    padding-left: 3px;
+    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;
-}
-
+    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;
-}
-
+    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;
+    float:left
 }
-
 .updatedvt {
-    line-height: 23px;
-    padding-left: 3px;
-    width: 98%;
-    border-bottom: 1px dashed #dcdcdc;
+    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;
+    border-bottom:1px solid #cccccc;
+    color:red;
+    font-weight:bold;
+    line-height:26px
 }
-
 .verline {
-    border-bottom: 1px dashed #cccccc;
-    line-height: 26px;
+    border-bottom:1px dashed #cccccc;
+    line-height:26px
 }
-
 .itemTable {
-    margin-top: 8px;
-    background: #CBD8AC;
+    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%;
-}
-
+    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;
+    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;
-}
-
+    width:49%;
+    float:left;
+    margin-right:1%;
+    height:670px
+}
 .column {
-    width: 49%;
-    float: left;
-    margin-right: 0.5%;
+    width:49%;
+    float:left;
+    margin-right:0.5%
 }
-
 .placeholder {
-    width: 98%;
-    margin-left: 1%;
-    background: #f0f0f0;
-    border: 1px dashed #ddd;
+    width:98%;
+    margin-left:1%;
+    background:#f0f0f0;
+    border:1px dashed #ddd
 }
-
 .dbox {
-    border: 1px solid #DEEAB6;
-    width: 98%;
-    margin-left: 1%;
-    margin-top: 8px;
+    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;
+    height:28px;
+    line-height:28px;
+    font-weight:bold;
+    color:#4D6C2F;
+    cursor:move
 }
-
 .dbox dt .l {
-    float: left;
-    padding-left: 8px;
+    float:left;
+    padding-left:8px
 }
-
 .dbox dt .r {
-    float: right;
-    padding-right: 8px;
+    float:right;
+    padding-right:8px
 }
-
 .dbox dt.lside {
-    border-bottom: 1px solid #CFD7C4;
-    background-color: rgb(239, 248, 229);
+    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;
+    border-bottom:1px solid #DEEAB6;
+    background:url(../images/wbg.gif) repeat-x
 }
-
 .dbox dd {
-    padding: 0px;
+    padding:0px
 }
-
 .dbox dd.intable {
-    padding-top: 3px;
+    padding-top:3px
 }
-
 #updatetest {
-    padding: 6px;
-    padding-left: 110px;
-    background: url("../images/ico_spider.gif") no-repeat scroll 10px 15px transparent;
+    padding:6px;
+    padding-left:110px;
+    background:url(../images/ico_spider.gif) no-repeat scroll 10px 15px transparent
 }
-
 #quickmenu {
-    width: 100%;
-    height: 46px;
-    overflow: hidden;
+    width:100%;
+    height:46px;
+    overflow:hidden
 }
-
 #quickmenu .icoitem {
-    float: left;
-    height: 24px;
-    line-height: 24px;
-    margin-top: 12px;
-    padding-left: 30px;
-    overflow: hidden;
-}
-
+    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;
+    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;
-}
-
+    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;
+    padding:0 15px;
+    line-height:23px
 }
-
 .biz img {
-    float: right;
-    margin: 40px 15px 0 15px;
+    float:right;
+    margin:40px 15px 0 15px
 }
-
 .footer {
-    line-height: 36px;
-    margin-top: 8px;
-    font-family: Verdana, Geneva, sans-serif;
+    line-height:36px
 }

src/dede/dialog/select_images.php

@@ -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

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

src/dede/dialog/select_templets.php

@@ -187,7 +187,7 @@ table{background:#fff}
                         <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/templets/index2.htm

@@ -1,128 +1,100 @@
-<!--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; ?>">
+  <title><?php echo $cfg_webname; ?>-<?php echo $cfg_soft_enname; ?> <?php echo $cfg_version_detail; ?></title>
+  <link rel="stylesheet" href="css/frame.css">
+  <link rel="stylesheet" href="images/style<?php echo $cfg_admin_skin;?>/style.css">
+  <script src="../static/js/jquery.js"></script>
+  <script src="js/frame.js"></script>
+  <style>
+#skinlist {
+  display:block;
+  height:11px;
+  margin-top:10px;
+  overflow:hidden;
+  width:86px
+}
+#skin div {
+  float:left
+}
+#skin li {
+  cursor:pointer;
+  float:left;
+  height:11px;
+  width:14px
+}
+#def div,#s1 div,#s2 div,#s3 div,#s4 div {
+  background-image:url("images/skinbutton.png");
+  background-repeat:no-repeat
+}
+#s1 div {
+  background-position:0 0px
+}
+#s2 div {
+  background-position:0 -11px
+}
+#s3 div {
+  background-position:0 -22px
+}
+#s4 div {
+  background-position:0 -33px
+}
+#s1 div.sel {
+  background:url("images/skinbutton.png") no-repeat scroll -14px top transparent
+}
+#s2 div.sel {
+  background:url("images/skinbutton.png") no-repeat scroll -14px -11px transparent
+}
+#s3 div.sel {
+  background:url("images/skinbutton.png") no-repeat scroll -14px -22px transparent
+}
+#s4 div.sel {
+  background:url("images/skinbutton.png") no-repeat scroll -14px -33px transparent
+}
   </style>
 </head>
-
 <body class="showmenu">
   <div class="pagemask"></div>
   <iframe class="iframemask"></iframe>
   <div class="allmenu">
     <div class="allmenu-box">
       <?php
-	echo $mapstring;
-?>
-      <br style='clear:both' />
+	     echo $mapstring;
+      ?>
+      <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_soft_enname; ?></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 class="welcome"><img src="/static/img/avatar.png" title="<?php echo $cuserLogin->getUserName(); ?>"><?php echo $cuserLogin->getUserName(); ?><a href="exit.php" target="_top">注销</a></li>
+          <li><a href="#" onclick="JumpFrame('index_menu.php','index_body.php');">后台主页</a></li>
           <li><a href="#" onclick="JumpFrame('catalog_menu.php','public_guide.php');">内容发布</a></li>
           <li><a href="#" onclick="JumpFrame('index_menu.php','content_list.php');">内容维护</a></li>
-          <li><a href="#" onclick="JumpFrame('index_menu.php','index_body.php');">系统主页</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>
+          <li><a href="../index.php?upcache=1" target="_blank">网站主页</a></li>
         </ul>
       </div>
     </div>
     <div class="topnav">
-      <div class="menuact"> <a href="#" id="togglemenu">隐藏菜单</a>
-        <?php
+      <div class="menuact"><a href="#" id="togglemenu">隐藏菜单</a>
+      <?php
 			if($cuserLogin->getUserType() >= 10) echo '<a href="#" id="allmenu">功能地图</a>';
 			?>
       </div>
-      <div id="skin">
-        <div>
-          
+      <div id="skin"><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="keyword" type="text" value="功能搜索" onfocus="if(this.value=='功能搜索'){this.value='';}" onblur="if(this.value==''){this.value='功能搜索';}" class="allsearch">
         <input name="" type="submit" value="搜索" class="np" />
         <a href='<?php echo $cfg_biz_gitUrl;?>' target='_blank'>代码托管</a> <a href='<?php echo $cfg_biz_helpUrl;?>'
           target='_blank'>帮助中心</a>
@@ -193,5 +165,4 @@
     })(jQuery);
   </script>
 </body>
-
 </html>

src/dede/templets/index_body.htm

@@ -1,10 +1,8 @@
-<!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>
+    <title>DedeBIZV6系统概况</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">
@@ -71,7 +69,7 @@
                         <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>
@@ -84,7 +82,7 @@
             <div class="col-md-6 mt-3">
                 <div class="card">
                     <div class="card-header">
-                        Dede商业服务授权
+                        <?php echo $cfg_soft_enname; ?> 商业服务授权
                     </div>
                     <!--/.card-header-->
                     <div class="card-body" id="_systeminfo">
@@ -99,8 +97,8 @@
                 <div class="card">
                     <div class="card-header">
                         快捷操作
-                        <a href='javascript:AddNew()'><b>【新增】</b></a>
-                        <a href='javascript:ListAll()'><b>【管理】</b></a>
+                        <a href="javascript:AddNew()" class="btn btn-success btn-sm">新增</a>
+                        <a href="javascript:ListAll()" class="btn btn-success btn-sm">管理</a>
                     </div>
                     <!--/.card-header-->
                     <div class="card-body">
@@ -245,17 +243,17 @@
                     <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 ";
+                            LEFT JOIN `#@__channeltype` ch ON ch.id = arc.channel
+                            WHERE arc.arcrank<>-2 ORDER BY arc.id DESC LIMIT 0, 5";
                         $arcArr = array();
                         $dsql->Execute('m', $query);
                         while($row = $dsql->GetArray('m'))
                         {
                             $arcArr[] = $row;
                         }
-                    ?>
+                        ?>
                         <table width="100%" class="table table-borderless">
-                            <?php
+                        <?php
                         if(count($arcArr) > 1)
                         {
                             foreach($arcArr as $row)
@@ -263,8 +261,8 @@
                                 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">
@@ -295,14 +293,11 @@
 
     <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 align="center" class="footer"><?php echo $cfg_powerby; ?> Powered by <a href="http://www.dedebiz.com" title="DedeBiz商业技术支持，提供更专业强大的站点应用开发技术">DedeBIZ <?php echo $cfg_version; ?></div>
 
         <!--  下面是隐藏的项目  -->
         <div id='loaddiv' style='display:none'>
-            <p align='center' style='padding-top:200px'><img src='images/loadinglit.gif' /> 请稍后，正在下载更新文件列表...</p>
+            <p align='center' style='padding-top:200px'><img src='images/loadinglit.gif'> 请稍后，正在下载更新文件列表...</p>
         </div>
         <div id="editTab">
             <span id='editTabBody'>请稍候，正在载入...</span>
@@ -314,7 +309,7 @@
                     <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;'>
+                            <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>
@@ -428,7 +423,7 @@
                         // 下面是DedeBIZ Core组件信息
                         infoStr += `
                         <tr>
-                            <td class="nline" style="text-align:left"> Dede商业组件： </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>
                         `;
@@ -436,7 +431,7 @@
                         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"> 商业组件： </td>
                             <td class="nline" style="text-align:left"> <a class="btn btn-success btn-sm" href="javascript:ViewDedeBIZ()">查看组件信息</a> </td>
                         </tr>
                         `;
@@ -446,8 +441,8 @@
                     $("#_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>
                     `);
                 }

src/dede/templets/index_menu2.htm

@@ -18,29 +18,25 @@ body {
 	overflow-x:hidden
 }
 div {
-	padding:0;
-	margin:0
-}
-.sitemu a {
-	font-size:12px;
-	color:rgba(0,0,0,.65)
+	margin:0;
+	padding:0
 }
 dl.bitem {
-	clear:both;
-	width:140;
-	margin:0 0 5px 12px;
-	background:url(images/menunewbg.gif) repeat-x
+	margin:0 0 6px 10px;
+	width:140px;
+	background:url(images/menunewbg.gif) repeat-x;
+	clear:both
 }
 dl.bitem2 {
-	clear:both;
-	width:140;
-	margin:0 0 5px 12px;
-	background:url(images/menunewbg2.gif) repeat-x
+	margin:0 0 6px 10px;
+	width:140px;
+	background:url(images/menunewbg2.gif) repeat-x;
+	clear:both
 }
 dl.bitem dt,dl.bitem2 dt {
-	height:25px;
-	line-height:25px;
-	padding-left:35px;
+	padding-left:36px;
+	height:26px;
+	line-height:26px;
 	cursor:pointer
 }
 dl.bitem dt b,dl.bitem2 dt b {
@@ -60,49 +56,44 @@ div.items {
 	width:80px
 }
 .flrct {
-	padding-top:2px;
-	float:left
+	float:left;
+	padding-top:4px
 }
 .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
+	padding:0 0 0 18px;
+	height:26px;
+	line-height:26px;
+	background:url(images/arr4.gif) no-repeat 6px 10px
 }
 a.mmac div {
-	background:url(images/leftbg2.gif) no-repeat;
+	padding:8px 4px 4px 10px;
 	height:38px!important;
-	padding:8px 4px 4px 10;
+	font-weight:600;
+	color:#325304;
+	background:url(images/leftbg2.gif) no-repeat;
 	word-wrap:break-word;
-	word-break:break-all;
-	font-weight:bold;
-	color:#325304
+	word-break:break-all
 }
 a.mm div {
-	background:url(images/leftmbg1.gif) no-repeat;
+	padding:8px 4px 4px 10px;
 	height:38px!important;
-	padding:8px 4px 4px 10;
-	word-wrap:break-word;
-	word-break:break-all;
-	font-weight:bold;
+	font-weight:600;
 	color:#475645;
-	cursor:pointer
+	cursor:pointer;
+	background:url(images/leftmbg1.gif) no-repeat;
+	word-wrap:break-word;
+	word-break:break-all
 }
 a.mm:hover div {
-	background:url(images/leftbg2.gif) no-repeat;
-	color:#4F7632
+	color:#4f7632;
+	background:url(images/leftbg2.gif) no-repeat
 }
 .mmf {
-	height:1px;
-	padding:5px 7px 5px 7px
+	padding:6px;
+	height:1px
 }
 #mainct {
-	padding-top:8px;
+	padding-top:12px;
 	background:url(images/idnbg1.gif) repeat-y
 }
 	</style>
@@ -123,23 +114,23 @@ a.mm:hover div {
 					<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>
 				<?php
-  	}
-  	?>
+				}
+				?>
 				<div class='mmf'></div>
 			</td>
 			<td width='160' id='mainct' valign="top">
 				<div id='ct1'>
-					<?php
-GetMenus($cuserLogin->getUserRank(), 'main');
-?>
+				<?php
+				GetMenus($cuserLogin->getUserRank(), 'main');
+				?>
 				</div>
 				<div id='ct100'></div>
 				<div id='ct3'></div>
@@ -156,20 +147,19 @@ GetMenus($cuserLogin->getUserRank(), 'main');
 		</tr>
 	</table>
 	<?php
-if(!empty($openitem) && $openitem!=1)
-{
-?>
+	if(!empty($openitem) && $openitem!=1)
+	{
+	?>
 	<script language='javascript'>
 		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

@@ -7,75 +7,62 @@
 	<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; ?>后台登录-<?php echo $cfg_soft_enname; ?> <?php echo $cfg_version_detail; ?></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-color:#f2f2f2
+}
+header {
+	background-color:#fff
+}
+header .logo {
+	width:260px;
+	padding:1em 0
+}
+.login-from {
+	max-width:620px;
+	width:100%
+}
+.login-area {
+	background-color:#fff;
+	padding:1em
+}
+.login-area .btnLogin {
+	width:100%
+}
+.login-power {
+	padding:1em 0
+}
+.login-power a,.goindex a {
+	color:#3DB058
+}
+.goindex {
+	line-height:60px
+}
 	</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" alt="<?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>
 				</div>
 			</div>
 		</div>
-
 	</header>
-
 	<main class="container login-from mt-3">
 		<div class="alert alert-warning" role="alert">
 			<?php echo $redmsg; ?>
 		</div>
-
 		<div class="login-area">
-			<h2 class="text-center">管理目录</h2>
+			<h3 class="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">
@@ -87,23 +74,17 @@
 				<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" id="validateimg" style="cursor:pointer" onclick="this.src='../plus/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
 					</div>
 				</div>
 				<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; ?> Powered by <a href="http://www.dedebiz.com" title="DedeBiz商业技术支持，提供更专业强大的站点应用开发技术">DedeBIZ <?php echo $cfg_version; ?></a>
+				</div>
 			</form>
 		</div>
 	</main>
-
 	<script src="../static/js/jquery.min.js"></script>
 	<script src="../static/js/bootstrap.bundle.js"></script>
 </body>
-
-</html>
+</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/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.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/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/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/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/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>