统一规范，调整各别错误，调整命名，移除富文本text

src/admin/freelist_main.php

@@ -55,7 +55,7 @@ if ($dopost=='') {
  */
 function GetTagList($dsql,$pageno,$pagesize,$orderby='aid')
 {
-    global $cfg_phpurl,$addsql;
+    global $cfg_phpurl, $addsql;
     $start = ($pageno-1) * $pagesize;
     $printhead ="<table width='98%' cellpadding='1' cellspacing='1' align='center' class='table maintable my-3'>
         <tr>

src/admin/makehtml_all.php

@@ -15,12 +15,9 @@ if ($action == '') {
     require_once(DEDEADMIN."/templets/makehtml_all.htm");
     exit();
 } else if ($action == 'make') {
-    //step = 1 更新首页、step = 2 更新文档、step = 3 更新栏目
+    //step = 1更新首页，step = 2更新文档，step = 3更新栏目
     if (empty($step)) $step = 1;
     //更新文档前优化数据
-    /*-------------------
-    function _1_OptimizeData1()
-    ---------------------*/
     if ($step == 1) {
         $starttime = GetMkTime($starttime);
         $mkvalue = ($uptype == 'time' ? $starttime : $startid);
@@ -29,17 +26,11 @@ if ($action == '') {
         exit();
     }
     //更新文档
-    /*-------------------
-    function _2_MakeArchives()
-    ---------------------*/
-else if ($step == 2) {
+    else if ($step == 2) {
         include_once(DEDEADMIN."/makehtml_archives_action.php");
         exit();
     }
     //更新首页
-    /*-------------------------
-    function _3_MakeHomePage()
-    -------------------*/
     if ($step == 3) {
         include_once(DEDEINC."/archive/partview.class.php");
         $pv = new PartView();
@@ -59,10 +50,7 @@ else if ($step == 2) {
         exit();
     }
     //更新栏目
-    /*-------------------
-    function _4_MakeCatalog()
-    --------------------*/
-else if ($step == 4) {
+    else if ($step == 4) {
         $mkvalue = intval($mkvalue);
         $typeidsok = $typeids = array();
         $adminID = $cuserLogin->getUserID();
@@ -115,10 +103,7 @@ else if ($step == 4) {
         }
     }
     //成功状态
-    /*-------------------
-    function _10_MakeAllOK()
-    --------------------*/
-else if ($step == 10) {
+    else if ($step == 10) {
         $adminID = $cuserLogin->getUserID();
         $mkcachefile = DEDEDATA."/mkall_cache_{$adminID}.php";
         @unlink($mkcachefile);
@@ -126,7 +111,6 @@ else if ($step == 10) {
         ShowMsg("完成所有栏目文档更新", "javascript:;");
         exit();
     }//make step
-
 }//action=='make'
 /**
  *  优化数据

src/admin/makehtml_archives.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 生成文档
+ * 更新文档
  *
  * @version        $id:makehtml_archives.php 9:10 2010年7月19日 tianya $
  * @package        DedeBIZ.Administrator

src/admin/makehtml_freelist.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 生成自由列表
+ * 更新自由列表
  *
  * @version        $id:makehtml_freelist.php 9:17 2010年7月19日 tianya $
  * @package        DedeBIZ.Administrator

src/admin/makehtml_homepage.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 生成首页
+ * 更新首页
  *
  * @version        $id:makehtml_homepage.php 2 9:30 2010-11-11 tianya $
  * @package        DedeBIZ.Administrator

src/admin/makehtml_list.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 生成列表栏目
+ * 更新列表栏目
  *
  * @version        $id:makehtml_list.php 11:09 2010年7月19日 tianya $
  * @package        DedeBIZ.Administrator

src/admin/makehtml_list_action.php

@@ -20,8 +20,7 @@ if (empty($typeid)) $typeid = 0;
 if (!isset($uppage)) $uppage = 0;
 if (empty($maxpagesize)) $maxpagesize = 30;
 $adminID = $cuserLogin->getUserID();
-//检测获取所有栏目id
-//普通更新或一键更新时更新所有栏目
+//检测获取所有栏目id，普通更新或一键更新时更新所有栏目
 if ($gotype == '' || $gotype == 'mkallct') {
     if ($upnext == 1 || $typeid == 0) {
         if ($typeid > 0) {
@@ -42,7 +41,7 @@ else if ($gotype == 'mkall') {
     $idArray = array();
     if (file_exists($mkcachefile)) require_once($mkcachefile);
 }
-//当前更新栏目的id
+//当前更新栏目id
 $totalpage = count($idArray);
 if (isset($idArray[$pageno])) {
     $tid = $idArray[$pageno];
@@ -60,7 +59,7 @@ if ($pageno == 0 && $mkpage == 1) //清空缓存
     $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache` ");
 }
 $reurl = '';
-//更新数组所记录的栏目
+//更新数组所记录栏目
 if (!empty($tid)) {
     if (!isset($cfg_Cs[$tid])) {
         ShowMsg('没有该栏目数据，可能缓存文件没有更新，请检查是否有写入权限', 'javascript:;');

src/admin/makehtml_spec.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 生成专题
+ * 更新专题
  *
  * @version        $id:makehtml_spec.php 11:17 2010年7月19日 tianya $
  * @package        DedeBIZ.Administrator

src/admin/makehtml_taglist.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 生成标签
+ * 更新标签
  *
  * @version        $id:makehtml_taglist.php 11:17 2020年8月19日 tianya $
  * @package        DedeBIZ.Administrator

src/admin/makehtml_taglist_action.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 生成标签操作
+ * 更新标签操作
  *
  * @version        $id:makehtml_taglist_action.php 11:17 2020年8月19日 tianya $
  * @package        DedeBIZ.Administrator

src/admin/sys_cloud.php

@@ -13,7 +13,6 @@ require_once(dirname(__FILE__) . "/config.php");
 CheckPurview('sys_Edit');
 $dopost = isset($dopost) ? $dopost : '';
 $client = new DedeBizClient();
-
 if ($dopost == "cloud_get") {
     $rs = $client->CloudGet();
     if ($rs->code === 200) {
@@ -56,10 +55,9 @@ if ($dopost == "cloud_get") {
     }
     exit;
 }
-
 if (!$client->IsEnabled()) {
     echo DedeAlert("商业扩展未启动或连接失败，请检查配置是否正确",ALERT_WARNING);
     exit();
 }
-
 include DedeInclude("templets/sys_cloud.htm");
+?>

src/admin/sys_login.php

@@ -10,5 +10,5 @@
  */
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('sys_Edit');
-
-include DedeInclude("templets/sys_login.htm");
+include DedeInclude("templets/sys_login.htm");
+?>

src/admin/templets/sys_cloud.htm

@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html>
-
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
@@ -12,7 +11,6 @@
 	<script src="../static/web/js/bootstrap.bundle.min.js"></script>
 	<script src="js/main.js"></script>
 </head>
-
 <body>
 	<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
 		<tr>
@@ -20,8 +18,6 @@
 				<table cellspacing="0" cellpadding="0" class="table table-borderless w-100">
 					<tr>
 						<td>云服务设置</td>
-						<!-- <td align="right"><span><a href="https://www.dedebiz.com/help" target="_blank"
-									class="btn btn-success btn-sm">更多云服务</a></span></td> -->
 					</tr>
 				</table>
 			</td>
@@ -30,25 +26,20 @@
 			<td colspan="4">
 				<ul class="nav nav-tabs" id="myTab" role="tablist">
 					<li class="nav-item" role="presentation">
-						<button class="nav-link active" id="aliyun-tab" data-toggle="tab" data-target="#aliyun"
-							type="button" role="tab" aria-controls="aliyun" aria-selected="true">阿里云</button>
+						<button class="nav-link active" id="aliyun-tab" data-toggle="tab" data-target="#aliyun" type="button" role="tab" aria-controls="aliyun" aria-selected="true">阿里云</button>
 					</li>
 					<li class="nav-item" role="presentation">
-						<button class="nav-link" id="huaweicloud-tab" data-toggle="tab" data-target="#huaweicloud"
-							type="button" role="tab" aria-controls="huaweicloud" aria-selected="false">华为云</button>
+						<button class="nav-link" id="huaweicloud-tab" data-toggle="tab" data-target="#huaweicloud" type="button" role="tab" aria-controls="huaweicloud" aria-selected="false">华为云</button>
 					</li>
 					<li class="nav-item" role="presentation">
-						<button class="nav-link" id="tencent-tab" data-toggle="tab" data-target="#tencent" type="button"
-							role="tab" aria-controls="tencent" aria-selected="false">腾讯云</button>
+						<button class="nav-link" id="tencent-tab" data-toggle="tab" data-target="#tencent" type="button" role="tab" aria-controls="tencent" aria-selected="false">腾讯云</button>
 					</li>
 				</ul>
 				<div class="tab-content py-3" id="myTabContent">
 					<div class="tab-pane fade show active" id="aliyun" role="tabpanel" aria-labelledby="aliyun-tab">
 						<div class="form-group">
 							<label for="iptAppID">描述</label>
-							<p>
-								阿里巴巴集团旗下公司，是全球领先的云计算及人工智能科技公司之一。提供免费试用、云服务器、云数据库、云安全、云企业应用等云计算服务，以及大数据、人工智能服务、精准定制基于场景的行业解决方案。免费备案，7x24小时售后支持，助企业无忧上云。
-							</p>
+							<p>阿里巴巴集团旗下公司，是全球领先的云计算及人工智能科技公司之一。提供免费试用、云服务器、云数据库、云安全、云企业应用等云计算服务，以及大数据、人工智能服务、精准定制基于场景的行业解决方案。免费备案，7x24小时售后支持，助企业无忧上云。</p>
 						</div>
 						<div class="form-group">
 							<label for="iptAliyunAccessKeyID">AccessKey ID</label>
@@ -66,9 +57,7 @@
 					<div class="tab-pane fade" id="huaweicloud" role="tabpanel" aria-labelledby="huaweicloud-tab">
 						<div class="form-group">
 							<label for="iptAppID">描述</label>
-							<p>
-								华为云提供稳定可靠、安全可信、可持续发展的云服务，致力于让云无处不在，让智能无所不及，共建智能世界云底座。助力企业降本增效，全球300万客户的共同选择。7x24小时专业服务支持，5天内无理由退订，免费快速备案。
-							</p>
+							<p>华为云提供稳定可靠、安全可信、可持续发展的云服务，致力于让云无处不在，让智能无所不及，共建智能世界云底座。助力企业降本增效，全球300万客户的共同选择。7x24小时专业服务支持，5天内无理由退订，免费快速备案。</p>
 						</div>
 						<div class="form-group">
 							<label for="iptHuaweicloudAccessKeyId">Access Key Id</label>
@@ -86,9 +75,7 @@
 					<div class="tab-pane fade" id="tencent" role="tabpanel" aria-labelledby="tencent-tab">
 						<div class="form-group">
 							<label for="iptAppID">描述</label>
-							<p>
-								腾讯云为数百万的企业和开发者提供安全稳定的云计算服务，涵盖云服务器、云数据库、云存储、视频与CDN、域名注册等全方位云服务和各行业解决方案。
-							</p>
+							<p>腾讯云为数百万的企业和开发者提供安全稳定的云计算服务，涵盖云服务器、云数据库、云存储、视频与CDN、域名注册等全方位云服务和各行业解决方案。</p>
 						</div>
 						<div class="form-group">
 							<label for="iptTencentSecretId">SecretId</label>
@@ -104,7 +91,6 @@
 						</div>
 					</div>
 					<button id="btnSave" type="submit" class="btn btn-success">保存</button>
-
 				</div>
 			</td>
 		</tr>
@@ -191,5 +177,4 @@
 		})
 	</script>
 </body>
-
 </html>

src/admin/templets/sys_login.htm

@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html>
-
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
@@ -11,7 +10,6 @@
 	<script src="../static/web/js/jquery.min.js"></script>
 	<script src="../static/web/js/bootstrap.bundle.min.js"></script>
 </head>
-
 <body>
 	<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
 		<tr>
@@ -19,8 +17,7 @@
 				<table cellspacing="0" cellpadding="0" class="table table-borderless w-100">
 					<tr>
 						<td>用户登录设置</td>
-						<td align="right"><span><a href="https://www.dedebiz.com/help" target="_blank"
-									class="btn btn-success btn-sm">更多接口</a></span></td>
+						<td align="right"><span><a href="https://www.dedebiz.com/help" target="_blank" class="btn btn-success btn-sm">更多接口</a></span></td>
 					</tr>
 				</table>
 			</td>
@@ -50,16 +47,13 @@
 				</form>
 				<ul class="nav nav-tabs" id="myTab" role="tablist">
 					<li class="nav-item" role="presentation">
-						<button class="nav-link" id="alipay-tab" data-toggle="tab" data-target="#alipay" type="button"
-							role="tab" aria-controls="alipay" aria-selected="false">手机验证码</button>
+						<button class="nav-link" id="alipay-tab" data-toggle="tab" data-target="#alipay" type="button" role="tab" aria-controls="alipay" aria-selected="false">手机验证码</button>
 					</li>
 					<li class="nav-item" role="presentation">
-						<button class="nav-link" id="bank-tab" data-toggle="tab" data-target="#bank" type="button"
-							role="tab" aria-controls="bank" aria-selected="false">微信登录</button>
+						<button class="nav-link" id="bank-tab" data-toggle="tab" data-target="#bank" type="button" role="tab" aria-controls="bank" aria-selected="false">微信登录</button>
 					</li>
 					<li class="nav-item" role="presentation">
-						<button class="nav-link" id="balance-tab" data-toggle="tab" data-target="#balance" type="button"
-							role="tab" aria-controls="balance" aria-selected="false">抖音登录</button>
+						<button class="nav-link" id="balance-tab" data-toggle="tab" data-target="#balance" type="button" role="tab" aria-controls="balance" aria-selected="false">抖音登录</button>
 					</li>
 				</ul>
 				<div class="tab-content py-3" id="myTabContent">
@@ -141,11 +135,9 @@
 						</form>
 					</div>
 					<button type="submit" class="btn btn-success">保存</button>
-
 				</div>
 			</td>
 		</tr>
 	</table>
 </body>
-
 </html>

src/static/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt

@@ -1,25 +0,0 @@
-Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
-For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
-
-cs.js      Found: 30 Missing: 0
-cy.js      Found: 30 Missing: 0
-da.js      Found: 12 Missing: 18
-de.js      Found: 30 Missing: 0
-el.js      Found: 25 Missing: 5
-eo.js      Found: 30 Missing: 0
-fa.js      Found: 30 Missing: 0
-fi.js      Found: 30 Missing: 0
-fr.js      Found: 30 Missing: 0
-gu.js      Found: 12 Missing: 18
-he.js      Found: 30 Missing: 0
-it.js      Found: 30 Missing: 0
-mk.js      Found: 5 Missing: 25
-nb.js      Found: 30 Missing: 0
-nl.js      Found: 30 Missing: 0
-no.js      Found: 30 Missing: 0
-pt-br.js   Found: 30 Missing: 0
-ro.js      Found: 6 Missing: 24
-tr.js      Found: 30 Missing: 0
-ug.js      Found: 27 Missing: 3
-vi.js      Found: 6 Missing: 24
-zh-cn.js   Found: 30 Missing: 0

src/static/ckeditor/plugins/devtools/lang/_translationstatus.txt

@@ -1,27 +0,0 @@
-Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
-
-bg.js      Found: 5 Missing: 0
-cs.js      Found: 5 Missing: 0
-cy.js      Found: 5 Missing: 0
-da.js      Found: 5 Missing: 0
-de.js      Found: 5 Missing: 0
-el.js      Found: 5 Missing: 0
-eo.js      Found: 5 Missing: 0
-et.js      Found: 5 Missing: 0
-fa.js      Found: 5 Missing: 0
-fi.js      Found: 5 Missing: 0
-fr.js      Found: 5 Missing: 0
-gu.js      Found: 5 Missing: 0
-he.js      Found: 5 Missing: 0
-hr.js      Found: 5 Missing: 0
-it.js      Found: 5 Missing: 0
-nb.js      Found: 5 Missing: 0
-nl.js      Found: 5 Missing: 0
-no.js      Found: 5 Missing: 0
-pl.js      Found: 5 Missing: 0
-tr.js      Found: 5 Missing: 0
-ug.js      Found: 5 Missing: 0
-uk.js      Found: 5 Missing: 0
-vi.js      Found: 5 Missing: 0
-zh-cn.js   Found: 5 Missing: 0

src/static/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
-For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
-
-cs.js      Found: 118 Missing: 0
-cy.js      Found: 118 Missing: 0
-de.js      Found: 118 Missing: 0
-el.js      Found: 16 Missing: 102
-eo.js      Found: 118 Missing: 0
-et.js      Found: 31 Missing: 87
-fa.js      Found: 24 Missing: 94
-fi.js      Found: 23 Missing: 95
-fr.js      Found: 118 Missing: 0
-hr.js      Found: 23 Missing: 95
-it.js      Found: 118 Missing: 0
-nb.js      Found: 118 Missing: 0
-nl.js      Found: 118 Missing: 0
-no.js      Found: 118 Missing: 0
-tr.js      Found: 118 Missing: 0
-ug.js      Found: 39 Missing: 79
-zh-cn.js   Found: 118 Missing: 0

src/static/ckeditor/plugins/uicolor/lang/_translationstatus.txt

@@ -1,27 +0,0 @@
-Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
-
-bg.js      Found: 4 Missing: 0
-cs.js      Found: 4 Missing: 0
-cy.js      Found: 4 Missing: 0
-da.js      Found: 4 Missing: 0
-de.js      Found: 4 Missing: 0
-el.js      Found: 4 Missing: 0
-eo.js      Found: 4 Missing: 0
-et.js      Found: 4 Missing: 0
-fa.js      Found: 4 Missing: 0
-fi.js      Found: 4 Missing: 0
-fr.js      Found: 4 Missing: 0
-he.js      Found: 4 Missing: 0
-hr.js      Found: 4 Missing: 0
-it.js      Found: 4 Missing: 0
-mk.js      Found: 4 Missing: 0
-nb.js      Found: 4 Missing: 0
-nl.js      Found: 4 Missing: 0
-no.js      Found: 4 Missing: 0
-pl.js      Found: 4 Missing: 0
-tr.js      Found: 4 Missing: 0
-ug.js      Found: 4 Missing: 0
-uk.js      Found: 4 Missing: 0
-vi.js      Found: 4 Missing: 0
-zh-cn.js   Found: 4 Missing: 0

src/system/archive/archives.class.php

@@ -267,7 +267,7 @@ class Archives
         return '';
     }
     /**
-     *  生成静态HTML
+     *  生成静态网页
      *
      * @access    public
      * @param     int    $isremote  是否远程

src/system/archive/searchview.class.php

@@ -151,8 +151,7 @@ class SearchView
      */
     function GetKeywords($keyword)
     {
-        global $cfg_soft_lang;
-        global $cfg_bizcore_appid, $cfg_bizcore_key;
+        global $cfg_soft_lang, $cfg_bizcore_appid, $cfg_bizcore_key;
         $keyword = cn_substr($keyword, 50);
         $row = $this->dsql->GetOne("SELECT spwords FROM `#@__search_keywords` WHERE keyword='".addslashes($keyword)."'; ");
         if (!is_array($row)) {
@@ -449,7 +448,7 @@ class SearchView
             } //End if
 
         }
-        global $keyword,  $oldkeyword;
+        global $keyword, $oldkeyword;
         if (!empty($oldkeyword)) $keyword = $oldkeyword;
         $this->dtp->Display();
     }

src/system/archive/sglistview.class.php

@@ -44,7 +44,7 @@ class SgListView
      */
     function __construct($typeid, $searchArr = array())
     {
-        global $dsql,$envs;
+        global $dsql, $envs;
         $envs['url_type'] = 1;
         $this->TypeID = $typeid;
         $this->dsql = $dsql;

src/system/archive/taglist.class.php

@@ -39,7 +39,7 @@ class TagList
      */
     function __construct($keyword, $templet)
     {
-        global $dsql,$envs,$cfg_cmsurl;
+        global $dsql, $envs, $cfg_cmsurl;
         $this->Templet = $templet;
         $this->Tag = (int)$keyword;
         $this->dsql = $dsql;
@@ -151,7 +151,7 @@ class TagList
      */
     function Display()
     {
-        global $cfg_cmspath,$cfg_tags_dir;
+        global $cfg_cmspath, $cfg_tags_dir;
         $tagsDir = str_replace("{cmspath}",$cfg_cmspath,$cfg_tags_dir);
         $makeDir = empty($this->Tag) ? $this->GetTruePath().$tagsDir."/index.html" : $this->GetTruePath().$tagsDir."/".$this->Tag."/index.html";
         if ($this->Tag != '') {
@@ -552,14 +552,14 @@ class TagList
     }
     function SetTagsDir($dir = '')
     {
-        global $cfg_tags_dir,$cfg_cmspath;
-        if ($dir == "") $dir = str_replace("{cmspath}",$cfg_cmspath,$cfg_tags_dir);
+        global $cfg_tags_dir, $cfg_cmspath;
+        if ($dir == "") $dir = str_replace("{cmspath}", $cfg_cmspath, $cfg_tags_dir);
         $this->tagsDir = $dir;
     }
     //生成静态Tag
     function MakeHtml($startpage = 1, $makepagesize = 0)
     {
-        global $cfg_dir_purview,$envs,$cfg_cmspath,$cfg_tags_dir,$cfg_cmsurl;
+        global $cfg_dir_purview, $envs, $cfg_cmspath, $cfg_tags_dir, $cfg_cmsurl;
         $envs['makeTag'] = 1;
         $tagsdir = str_replace("{cmspath}", $cfg_cmspath, $cfg_tags_dir);
         if (isset($envs['makeTag']) && $envs['makeTag'] == 1) {

src/system/libraries/dedebiz.class.php

@@ -10,7 +10,7 @@ class DedeBizClient
     var $err;
     function __construct()
     {
-        global $cfg_bizcore_appid,$cfg_bizcore_key,$cfg_bizcore_hostname, $cfg_bizcore_port;
+        global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port;
         $this->appid = $cfg_bizcore_appid;
         $this->key = $cfg_bizcore_key;
         $this->err = "";

src/system/libraries/statistics.class.php

@@ -17,7 +17,7 @@ class DedeStatistics {
     //获取统计js
     function GetStat()
     {
-        global $envs,$cfg_cookie_encode;
+        global $envs, $cfg_cookie_encode;
         $agent = new Agent();
         //不记录爬虫
         if ($agent->isRobot()) {
@@ -86,7 +86,7 @@ class DedeStatistics {
     //统计
     function Record()
     {
-        global $dsql,$cfg_cookie_encode;
+        global $dsql, $cfg_cookie_encode;
         //进行统计
         $pm = array('dduuid','ssid','browser','device','device_type','os','t','created_date','created_hour','url_type','typeid','aid','value','sign');
         $pmvalue = array();

src/system/taglib/tag.lib.php

@@ -11,7 +11,7 @@ if (!defined('DEDEINC')) exit('dedebiz');
  */
 function lib_tag(&$ctag, &$refObj)
 {
-    global $dsql, $envs, $cfg_cmsurl,$cfg_tags_dir;
+    global $dsql, $envs, $cfg_cmsurl, $cfg_tags_dir;
     //属性处理
     $attlist = "row|30,sort|new,getall|0,typeid|0,ishtml|0";
     FillAttsDefault($ctag->CAttribute->Items, $attlist);

src/user/config.php

@@ -12,7 +12,6 @@ function XSSClean($val)
     global $cfg_soft_lang;
     if ($cfg_soft_lang == 'gb2312') gb2utf8($val);
     if (is_array($val)) {
-        //while (list($key) = each($val))
         foreach ($val as $key => $value) {
             if (in_array($key, array('tags', 'body', 'dede_fields', 'dede_addonfields', 'dopost', 'introduce'))) continue;
             $val[$key] = XSSClean($val[$key]);
@@ -76,9 +75,7 @@ function CheckCSRF()
 {
     $cc_csrf_token_check = GetCookie("dede_csrf_token");
     if (
-        !(isset($_POST['_csrf_token'], $cc_csrf_token_check)
-            && is_string($_POST['_csrf_token']) && is_string($cc_csrf_token_check)
-            && hash_equals($_POST['_csrf_token'], $cc_csrf_token_check))
+        !(isset($_POST['_csrf_token'], $cc_csrf_token_check) && is_string($_POST['_csrf_token']) && is_string($cc_csrf_token_check) && hash_equals($_POST['_csrf_token'], $cc_csrf_token_check))
     ) {
         ShowMsg('刷新页面重新提交，请不要发布重复文档', '-1');
         exit();
@@ -128,10 +125,9 @@ if ($cfg_mb_open == 'N') {
 }
 $keeptime = isset($keeptime) && is_numeric($keeptime) ? $keeptime : -1;
 $cfg_ml = new MemberLogin($keeptime);
-
-// 检查收件箱
+//检查收件箱
 function PmRead(){
-    global $dsql,$cfg_ml;
+    global $dsql, $cfg_ml;
     $query = "SELECT * FROM `#@__member_pms` WHERE folder LIKE 'outbox' AND isadmin='1'";
     $dsql->SetQuery($query);
     $dsql->Execute();
@@ -232,7 +228,6 @@ function countArchives($channelid)
         return FALSE;
     }
 }
-
 //安全提示问题，这两句不要修改
 $safequestions = array();
 $safequestions[0] = '没安全提示问题';