移除不必要注释，添加6.2.X版本特征，优化菜单

src/admin/catalog_do.php

@@ -191,9 +191,9 @@ else if ($dopost == "GetSunLists") {
     PutCookie('lastCid', $cid, 3600 * 24, "/");
     $tu = new TypeUnit();
     $tu->dsql = $dsql;
-    echo "    <table width='100%' cellspacing='0' cellpadding='0'>\r\n";
+    echo "<table width='100%' cellspacing='0' cellpadding='0'>\r\n";
     $tu->LogicListAllSunType($cid, "　");
-    echo "    </table>\r\n";
+    echo "</table>\r\n";
     $tu->Close();
 }
 /*----------------

src/admin/mychannel_edit.php

@@ -177,9 +177,9 @@ else if ($dopost == "exportinok") {
         $tabsql = "CREATE TABLE IF NOT EXISTS `{$fields['addtable']}`(`aid` int(11) NOT NULL default '0',`typeid` int(11) NOT NULL default '0',`channel` SMALLINT NOT NULL DEFAULT '0',`arcrank` SMALLINT NOT NULL DEFAULT '0',`mid` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0',`click` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0',`title` varchar(255) NOT NULL default '',`senddate` int(11) NOT NULL default '0',`flag` set('c','h','p','f','s','j','a','b') default NULL,";
     }
     if ($mysql_version < 4.1) {
-        $tabsql .= "    PRIMARY KEY  (`aid`), KEY `typeid` (`typeid`)\r\n) TYPE=MyISAM; ";
+        $tabsql .= "PRIMARY KEY  (`aid`), KEY `typeid` (`typeid`)\r\n) TYPE=MyISAM;";
     } else {
-        $tabsql .= "    PRIMARY KEY  (`aid`), KEY `typeid` (`typeid`)\r\n) ENGINE=MyISAM DEFAULT CHARSET=".$cfg_db_language."; ";
+        $tabsql .= "PRIMARY KEY  (`aid`), KEY `typeid` (`typeid`)\r\n) ENGINE=MyISAM DEFAULT CHARSET=".$cfg_db_language.";";
     }
     $rs = $dsql->ExecuteNoneQuery($tabsql);
     if (!$rs) {

src/admin/swfupload.php

@@ -142,7 +142,7 @@ else if ($dopost == 'thumbnail') {
     exit(0);
 }
 /************************
-//删除指定ID的图片
+//删除指定id的图片
 *************************/
 else if ($dopost == 'del') {
     if (!isset($_SESSION['bigfile_info'][$id])) {

src/system/archive/archives.class.php

@@ -13,13 +13,6 @@ require_once(DEDEINC."/typelink/typelink.class.php");
 require_once(DEDEINC."/channelunit.class.php");
 require_once(DEDEINC."/downmix.inc.php");
 @set_time_limit(0);
-/**
- * 主文档类(Archives类)
- *
- * @package          TypeLink
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class Archives
 {
     var $TypeLink;

src/system/archive/freelist.class.php

@@ -11,13 +11,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
  */
 require_once DEDEINC.'/archive/partview.class.php';
 @set_time_limit(0);
-/**
- * 自由列表类
- *
- * @package          FreeList
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class FreeList
 {
     var $dsql;
@@ -605,14 +598,14 @@ class FreeList
                     $artlist .= "";
                 }
                 if ($col > 1) {
-                    $artlist .= "    </td>\r\n";
+                    $artlist .= "</td>\r\n";
                 }
             } //Loop Col
             if ($col > 1) {
                 $i += $col - 1;
             }
             if ($col > 1) {
-                $artlist .= "    </tr>\r\n";
+                $artlist .= "</tr>\r\n";
             }
         } //Loop Line
         if ($col > 1) {

src/system/archive/listview.class.php

@@ -12,13 +12,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
 require_once(DEDEINC.'/archive/partview.class.php');
 helper('cache');
 @set_time_limit(0);
-/**
- * 自由列表类
- *
- * @package          ListView
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class ListView
 {
     var $dsql;

src/system/archive/partview.class.php

@@ -11,13 +11,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
  */
 require_once(DEDEINC.'/channelunit.class.php');
 require_once(DEDEINC.'/typelink/typelink.class.php');
-/**
- * 视图类
- *
- * @package          PartView
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class PartView
 {
     var $dsql;

src/system/archive/searchview.class.php

@@ -16,13 +16,6 @@ require_once(DEDEINC."/taglib/hotwords.lib.php");
 require_once(DEDEINC."/taglib/channel.lib.php");
 @set_time_limit(0);
 @ini_set('memory_limit', '512M');
-/**
- * 搜索视图类
- *
- * @package          SearchView
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class SearchView
 {
     var $dsql;

src/system/archive/sglistview.class.php

@@ -11,13 +11,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
  */
 @set_time_limit(0);
 require_once(DEDEINC."/archive/partview.class.php");
-/**
- * 单表模型列表视图类
- *
- * @package          SgListView
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class SgListView
 {
     var $dsql;
@@ -659,7 +652,7 @@ class SgListView
             } //Loop Col
             if ($col > 1) {
                 $i += $col - 1;
-                $artlist .= "    </div>\r\n";
+                $artlist .= "</div>\r\n";
             }
         } //Loop Line
         $t3 = ExecTime();

src/system/archive/sgpage.class.php

@@ -10,13 +10,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * @link           https://www.dedebiz.com
  */
 require_once(DEDEINC."/archive/partview.class.php");
-/**
- * 单表模型列表视图类
- *
- * @package          SgListView
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class sgpage
 {
     var $dsql;
@@ -29,7 +22,7 @@ class sgpage
      *  php5构造函数
      *
      * @access    public
-     * @param     int  $aid  文档ID
+     * @param     int  $aid  文档id
      * @return    string
      */
     function __construct($aid)

src/system/archive/specview.class.php

@@ -12,13 +12,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
 require_once(DEDEINC."/typelink/typelink.class.php");
 require_once(DEDEINC."/channelunit.class.php");
 @set_time_limit(0);
-/**
- * 专题视图类
- *
- * @package          SpecView
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class SpecView
 {
     var $dsql;

src/system/archive/taglist.class.php

@@ -12,13 +12,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
 require_once(DEDEINC.'/channelunit.class.php');
 require_once(DEDEINC.'/typelink/typelink.class.php');
 @set_time_limit(0);
-/**
- * 标签列表
- *
- * @package          TagList
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class TagList
 {
     var $dsql;
@@ -391,7 +384,7 @@ class TagList
             } //Loop Col
             if ($col > 1) {
                 $i += $col - 1;
-                $artlist .= "    </div>\r\n";
+                $artlist .= "</div>\r\n";
             }
         } //Loop Line
         $this->dsql->FreeResult('al');

src/system/channelunit.class.php

@@ -11,9 +11,7 @@ if (!defined('DEDEINC')) exit('dedebiz');
  */
 require_once(DEDEINC."/dedetag.class.php");
 require_once(DEDEINC."/channelunit.func.php");
-/*----------------------------------
-function C____ChannelUnit();
------------------------------------*/
+//function C____ChannelUnit();
 class ChannelUnit
 {
     var $ChannelInfos;
@@ -75,10 +73,10 @@ class ChannelUnit
         $this->__construct($cid, $aid);
     }
     /**
-     *  设置文档ID
+     *  设置文档id
      *
      * @access    private
-     * @param     int   $aid  文档ID
+     * @param     int   $aid  文档id
      * @return    void
      */
     function SetArcID($aid)

src/system/database/dedesqli.class.php

@@ -16,8 +16,7 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * @link           https://www.dedebiz.com
  */
 @set_time_limit(0);
-//在工程所有文件中均不需要单独初始化这个类，可直接用 $dsql或$db进行操作
-//为了防止错误，操作完后不必关闭数据库
+//在工程所有文件中均不需要单独初始化这个类，可直接用$dsql或$db进行操作，为了防止错误，操作完后不必关闭数据库
 if (!function_exists("mysqli_init")) {
     ShowMsg("尚未发现开启mysqli模块，请在php.ini中启用`extension=mysqli`","javasctipt:;",-1) ;
     exit;

src/system/database/dedesqlite.class.php

@@ -20,8 +20,7 @@ if (!extension_loaded("sqlite3")) {
     ShowMsg("尚未发现开启sqlite3模块，请在php.ini中启用`extension=sqlite3`","javasctipt:;",-1) ;
     exit;
 }
-//在工程所有文件中均不需要单独初始化这个类，可直接用 $dsql或$db进行操作
-//为了防止错误，操作完后不必关闭数据库
+//在工程所有文件中均不需要单独初始化这个类，可直接用$dsql或$db进行操作，为了防止错误，操作完后不必关闭数据库
 $dsql = $dsqlitete = $db = new DedeSqlite(FALSE);
 /**
  * Dede SQLite3数据库类

src/system/dedeatt.class.php

@@ -8,14 +8,6 @@
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-/**
- * 属性的数据描述
- * function c____DedeAtt();
- *
- * @package          DedeAtt
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class DedeAtt
 {
     var $Count = -1;

src/system/dedetag.class.php

@@ -9,14 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-/**
- * class DedeTag 标记的数据结构描述
- * function c____DedeTag();
- *
- * @package          DedeTag
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class DedeTag
 {
     var $IsReplace = FALSE; //标记是否已被替代，供解析器使用
@@ -427,7 +419,7 @@ class DedeTagParse
         return $this->GetTag($str);
     }
     /**
-     *  获得指定ID的CTag数据类
+     *  获得指定id的CTag数据类
      *
      * @access    public
      * @param     string  标签id
@@ -457,7 +449,7 @@ class DedeTagParse
         $_sys_globals[$vname] = $vvalue;
     }
     /**
-     *  分配指定ID的标记的值
+     *  分配指定id的标记的值
      *
      * @access    public
      * @param     string   $i  标签id

src/system/dedevote.class.php

@@ -10,13 +10,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * @link           https://www.dedebiz.com
  */
 require_once(DEDEINC."/dedetag.class.php");
-/**
- * 投票类
- *
- * @package          DedeVote
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class DedeVote
 {
     var $VoteInfos;

src/system/diyform.class.php

@@ -11,13 +11,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
  */
 require_once DEDEINC.'/dedetag.class.php';
 require_once DEDEINC.'/customfields.func.php';
-/**
- * diyform
- *
- * @package          diyform
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class diyform
 {
     var $diyid;

src/system/helpers/channelunit.helper.php

@@ -548,7 +548,7 @@ function GetBookUrl($bid, $title, $gdir = 0)
 /**
  *  根据ID生成目录
  *
- * @param     string  $aid  文档ID
+ * @param     string  $aid  文档id
  * @return    int
  */
 function DedeID2Dir($aid)

src/system/helpers/util.helper.php

@@ -10,7 +10,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * @link           https://www.dedebiz.com
  */
 define('T_NEW_LINE', -1);
-
 if (!function_exists('token_get_all_nl')) {
     function token_get_all_nl($source)
     {

src/system/taglib/arccontent.lib.php

@@ -10,13 +10,7 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * @link           https://www.dedebiz.com
  */
 require_once(DEDEINC."/channelunit.class.php");
-//这是一个用来调用文档的标签，只是提供一种方法，不建议太多地方调用，毕竟比较损耗性能
-/*
-用法：
-{dede:arccontent type='pre|next'}
-[field:body/]
-{/dede:arccontent}
-*/
+//这是一个用来调用文档的标签，只是提供一种方法，不建议太多地方调用，毕竟比较损耗性能，用法：{dede:arccontent type='pre|next'}[field:body/]{/dede:arccontent}
 function lib_arccontent(&$ctag, &$refObj)
 {
     global $dsql;
@@ -34,7 +28,7 @@ function lib_arccontent(&$ctag, &$refObj)
         $fields = $dsql->GetOne("SELECT * FROM `{$channel->ChannelInfos['addtable']}` WHERE aid = {$row['id']}");
     }
     if (!empty($aid)) {
-        //指定ID获取文档
+        //指定id获取文档
         $row =  $dsql->GetOne("SELECT id,channel FROM `#@__arctiny` WHERE id={$aid} AND arcrank>-1");
         $channel = new ChannelUnit($row['channel'], $aid);
         $fields = $dsql->GetOne("SELECT * FROM `{$channel->ChannelInfos['addtable']}` WHERE aid = {$row['id']}");

src/system/taglib/arclist.lib.php

@@ -301,7 +301,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele
     $dsql->SetQuery($query);
     $dsql->Execute('al');
     $artlist = '';
-    if ($pagesize > 0)  $artlist .= "    <div id='{$tagid}'>\r\n";
+    if ($pagesize > 0)  $artlist .= "<div id='{$tagid}'>\r\n";
     if ($col > 1) $artlist = "<table width='$tablewidth' cellspacing='0' cellpadding='0'>\r\n";
     $dtp2 = new DedeTagParse();
     $dtp2->SetNameSpace('field', '[', ']');
@@ -312,7 +312,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele
     for ($i = 0; $i < $line; $i++) {
         if ($col > 1) $artlist .= "<tr>\r\n";
         for ($j = 0; $j < $col; $j++) {
-            if ($col > 1) $artlist .= "    <td width='$colWidth'>\r\n";
+            if ($col > 1) $artlist .= "<td width='$colWidth'>\r\n";
             if ($row = $dsql->GetArray("al")) {
                 $ids[] = $row['id'];
                 //处理一些特殊字段
@@ -413,12 +413,12 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele
                     $artlist .= $vv['arclist'];
                 }
             }
-            if ($col > 1) $artlist .= "    </td>\r\n";
+            if ($col > 1) $artlist .= "</td>\r\n";
         }//Loop Col
         if ($col > 1) $i += $col - 1;
-        if ($col > 1) $artlist .= "    </tr>\r\n";
+        if ($col > 1) $artlist .= "</tr>\r\n";
     }//loop line
-    if ($col > 1) $artlist .= "    </table>\r\n";
+    if ($col > 1) $artlist .= "</table>\r\n";
     $dsql->FreeResult("al");
     $idsstr = join(',', $ids);
     //保存ID缓存

src/system/taglib/arclistsg.lib.php

@@ -149,7 +149,7 @@ function lib_arclistsg(&$ctag, &$refObj)
     $ids = array();
     for ($i = 0; $i < $line; $i++) {
         for ($j = 0; $j < $col; $j++) {
-            if ($col > 1) $artlist .= "    <div>\r\n";
+            if ($col > 1) $artlist .= "<div>\r\n";
             if ($row = $dsql->GetArray("al")) {
                 $ids[] = $row['aid'];
                 $row['filename'] = $row['arcurl'] = GetFileUrl(
@@ -212,7 +212,7 @@ function lib_arclistsg(&$ctag, &$refObj)
             else {
                 $artlist .= '';
             }
-            if ($col > 1) $artlist .= "    </div>\r\n";
+            if ($col > 1) $artlist .= "</div>\r\n";
         } //Loop Col
         if ($col > 1) $i += $col - 1;
     } //loop line

src/system/taglib/channel.lib.php

@@ -109,7 +109,7 @@ function lib_channel(&$ctag, &$refObj)
         }//Loop Col
         if ($col > 1) {
             $i += $col - 1;
-            $likeType .= "    </dl>\r\n";
+            $likeType .= "</dl>\r\n";
         }
     }//Loop for $i
     $dsql->FreeResult();

src/system/taglib/channel/stepselect.lib.php

@@ -1,9 +1,5 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
-function ch_stepselect($fvalue, &$arcTag, &$refObj, $fname = '')
-{
-    return GetEnumsValue2($fname, $fvalue);
-}
 /**
  * 获取二级枚举的值
  *
@@ -13,6 +9,10 @@ function ch_stepselect($fvalue, &$arcTag, &$refObj, $fname = '')
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
+function ch_stepselect($fvalue, &$arcTag, &$refObj, $fname = '')
+{
+    return GetEnumsValue2($fname, $fvalue);
+}
 function GetEnumsValue2($egroup, $evalue = 0)
 {
     if (!isset($GLOBALS['em_'.$egroup.'s'])) {

src/system/taglib/flinktype.lib.php

@@ -1,6 +1,5 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
-require_once(DEDEINC."/taglib/flink.lib.php");
 /**
  * 友情链接
  *
@@ -10,6 +9,7 @@ require_once(DEDEINC."/taglib/flink.lib.php");
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
+require_once(DEDEINC."/taglib/flink.lib.php");
 function lib_flinktype(&$ctag, &$refObj)
 {
     global $dsql;

src/system/taglib/likearticle.lib.php

@@ -89,7 +89,7 @@ function lib_likearticle(&$ctag, &$refObj)
     for ($i = 0; $i < $line; $i++) {
         if ($col > 1) $artlist .= "<tr>\r\n";
         for ($j = 0; $j < $col; $j++) {
-            if ($col > 1) $artlist .= "    <td width='$colWidth'>\r\n";
+            if ($col > 1) $artlist .= "<td width='$colWidth'>\r\n";
             if ($row = $dsql->GetArray("al")) {
                 $ids[] = $row['id'];
                 //处理一些特殊字段
@@ -160,14 +160,14 @@ function lib_likearticle(&$ctag, &$refObj)
             else {
                 $artlist .= '';
             }
-            if ($col > 1) $artlist .= "    </td>\r\n";
+            if ($col > 1) $artlist .= "</td>\r\n";
         }
         //Loop Col
         if ($col > 1) $i += $col - 1;
-        if ($col > 1) $artlist .= "    </tr>\r\n";
+        if ($col > 1) $artlist .= "</tr>\r\n";
     }
     //loop line
-    if ($col > 1) $artlist .= "    </table>\r\n";
+    if ($col > 1) $artlist .= "</table>\r\n";
     $dsql->FreeResult("al");
     return $artlist;
 }

src/system/taglib/memberlist.lib.php

@@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-//orderby = logintime(login new) or mid(register new)
 function lib_memberlist(&$ctag, &$refObj)
 {
     global $dsql, $sqlCt;

src/system/taglib/relation.lib.php

@@ -66,7 +66,7 @@ function lib_relation(&$ctag, &$refObj)
     for ($i = 0; $i < $line; $i++) {
         if ($col > 1) $artlist .= "<tr>\r\n";
         for ($j = 0; $j < $col; $j++) {
-            if ($col > 1) $artlist .= "    <td width='$colWidth'>\r\n";
+            if ($col > 1) $artlist .= "<td width='$colWidth'>\r\n";
             if ($row = $dsql->GetArray("al")) {
                 if ($channelid > 0) {
                     $row['id'] =  $row['id'];
@@ -147,14 +147,14 @@ function lib_relation(&$ctag, &$refObj)
             else {
                 $artlist .= '';
             }
-            if ($col > 1) $artlist .= "    </td>\r\n";
+            if ($col > 1) $artlist .= "</td>\r\n";
         }
         //Loop Col
         if ($col > 1) $i += $col - 1;
-        if ($col > 1) $artlist .= "    </tr>\r\n";
+        if ($col > 1) $artlist .= "</tr>\r\n";
     }
     //loop line
-    if ($col > 1) $artlist .= "    </table>\r\n";
+    if ($col > 1) $artlist .= "</table>\r\n";
     $dsql->FreeResult("al");
     return $artlist;
 }

src/system/taglib/sonchannel.lib.php

@@ -46,7 +46,7 @@ function lib_sonchannel(&$ctag, &$refObj)
         } //Loop Col
         if ($col > 1) {
             $i += $col - 1;
-            $likeType .= "    </dl>\r\n";
+            $likeType .= "</dl>\r\n";
         }
     } //Loop for $i
     $dsql->FreeResult();

src/system/taglib/statistics.lib.php

@@ -1,6 +1,5 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
-require_once(DEDEINC."/libraries/statistics.class.php");
 /**
  * 统计标签
  *
@@ -10,6 +9,7 @@ require_once(DEDEINC."/libraries/statistics.class.php");
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
+require_once(DEDEINC."/libraries/statistics.class.php");
 function lib_statistics(&$ctag, &$refObj)
 {
     global $envs;

src/system/tpllib/plus_channel.php

@@ -1,6 +1,5 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
-require_once(DEDEINC.'/channelunit.func.php');
 /**
  * 动态模板channel标签
  *
@@ -10,6 +9,7 @@ require_once(DEDEINC.'/channelunit.func.php');
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
+require_once(DEDEINC.'/channelunit.func.php');
 function plus_channel(&$atts, &$refObj, &$fields)
 {
     global $dsql, $_vars;

src/system/typelink/typelink.class.php

@@ -10,13 +10,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * @link           https://www.dedebiz.com
  */
 require_once(DEDEINC."/channelunit.func.php");
-/**
- * 当前位置面包屑
- *
- * @package          TypeLink
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class TypeLink
 {
     var $typeDir;
@@ -313,7 +306,7 @@ class TypeLink
                 $likeType .= "<tr>\r\n";
             }
             for ($j = 0; $j < $col; $j++) {
-                if ($col > 1) $likeType .= "    <td width='$colWidth'>\r\n";
+                if ($col > 1) $likeType .= "<td width='$colWidth'>\r\n";
                 if ($row = $this->dsql->GetArray()) {
                     //处理当前栏目的样式
                     if ($row['id'] == "$typeid" && $myinnertext != '') {
@@ -336,7 +329,7 @@ class TypeLink
                     }
                 }
                 if ($col > 1) {
-                    $likeType .= "    </td>\r\n";
+                    $likeType .= "</td>\r\n";
                 }
                 $GLOBALS['autoindex']++;
             }//Loop Col
@@ -344,11 +337,11 @@ class TypeLink
                 $i += $col - 1;
             }
             if ($col > 1) {
-                $likeType .= "    </tr>\r\n";
+                $likeType .= "</tr>\r\n";
             }
         }//Loop for $i
         if ($col > 1) {
-            $likeType .= "    </table>\r\n";
+            $likeType .= "</table>\r\n";
         }
         $this->dsql->FreeResult();
         return $likeType;

src/system/typelink/typeunit.class.admin.php

@@ -1,7 +1,7 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
 /**
- * 后台栏目管理选择框
+ * 后台栏目管理
  *
  * @version        $id:typeunit.class.admin.php 15:21 2010年7月5日 tianya $
  * @package        DedeBIZ.Libraries
@@ -10,13 +10,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * @link           https://www.dedebiz.com
  */
 require_once(DEDEINC."/channelunit.func.php");
-/**
- * 后台栏目管理选择框
- *
- * @package          TypeUnit
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class TypeUnit
 {
     var $dsql;
@@ -117,7 +110,7 @@ class TypeUnit
             //普通列表
             if ($ispart == 0) {
                 echo "<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">";
-                echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'><i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-success btn-xs'>列表</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives'><span class='mr-3 ml-3'>".$typeName."</span></a>[id：".$id."]（文档数：".$this->GetTotalArc($id)."）";
+                echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'><i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-success btn-xs'>列表</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]（文档数：".$this->GetTotalArc($id)."）";
                 echo "</td><td align='right'>";
                 echo "<a href='{$GLOBALS['cfg_phpurl']}/list.php?tid={$id}' target='_blank' title='预览'><i class='btn btn-sm fa fa-eye'></i></a>";
                 echo "<a href='catalog_do.php?cid={$id}&dopost=listArchives' title='文档'><i class='btn btn-sm fa fa-bars'></i></a>";
@@ -130,7 +123,7 @@ class TypeUnit
             //带封面的栏目
             else if ($ispart == 1) {
                 echo "<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">";
-                echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'><i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-warning btn-xs'>封面</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives'><span class='mr-3 ml-3'>".$typeName."</span></a>[id：".$id."]";
+                echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'><i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-warning btn-xs'>封面</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
                 echo "</td><td align='right'>";
                 echo "<a href='{$GLOBALS['cfg_phpurl']}/list.php?tid={$id}' target='_blank' title='预览'><i class='btn btn-sm fa fa-eye'></i></a>";
                 echo "<a href='catalog_do.php?cid={$id}&dopost=listArchives' title='文档'><i class='btn btn-sm fa fa-bars'></i></a>";
@@ -143,7 +136,7 @@ class TypeUnit
             //独立页面
             else if ($ispart == 2) {
                 echo "<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">";
-                echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'><i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-primary btn-xs'>外部</span>{$nss}<a href='catalog_edit.php?id=".$id."'><span class='mr-3 ml-3'>".$typeName."</span></a>[id：".$id."]";
+                echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'><i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-primary btn-xs'>外部</span>{$nss}<a href='catalog_edit.php?id=".$id."' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
                 echo "</td><td align='right'>";
                 echo "<a href='{$typeDir}' target='_blank' title='预览'><i class='btn btn-sm fa fa-eye'></i></a>";
                 echo "<a href='catalog_edit.php?id={$id}' title='修改'><i class='btn btn-sm fa fa-pencil-square-o'></i></a>";
@@ -200,7 +193,7 @@ class TypeUnit
                 if ($ispart == 0) {
                     echo "<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">";
                     echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'>";
-                    echo "$step<i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-success btn-xs'>列表</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives'><span class='mr-3 ml-3'>".$typeName."</span></a>[id：".$id."]（文档数：".$this->GetTotalArc($id)."）";
+                    echo "$step<i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-success btn-xs'>列表</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]（文档数：".$this->GetTotalArc($id)."）";
                     echo "</td><td align='right'>";
                     echo "<a href='{$GLOBALS['cfg_phpurl']}/list.php?tid={$id}' target='_blank' title='预览'><i class='btn btn-sm fa fa-eye'></i></a>";
                     echo "<a href='catalog_do.php?cid={$id}&dopost=listArchives' title='文档'><i class='btn btn-sm fa fa-bars'></i></a>";
@@ -214,7 +207,7 @@ class TypeUnit
                 else if ($ispart == 1) {
                     echo "<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">";
                     echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'>";
-                    echo "$step<i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-warning btn-xs'>封面</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives'><span class='mr-3 ml-3'>".$typeName."</span></a>[id：".$id."]";
+                    echo "$step<i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-warning btn-xs'>封面</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
                     echo "</td><td align='right'>";
                     echo "<a href='{$GLOBALS['cfg_phpurl']}/list.php?tid={$id}' target='_blank' title='预览'><i class='btn btn-sm fa fa-eye'></i></a>";
                     echo "<a href='catalog_do.php?cid={$id}&dopost=listArchives' title='文档'><i class='btn btn-sm fa fa-bars'></i></a>";
@@ -228,7 +221,7 @@ class TypeUnit
                 else if ($ispart == 2) {
                     echo "<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">";
                     echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'>";
-                    echo "$step<i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-primary btn-xs'>外部</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives'><span class='mr-3 ml-3'>".$typeName."</span></a>[id：".$id."]";
+                    echo "$step<i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-primary btn-xs'>外部</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
                     echo "</td><td align='right'>";
                     echo "<a href='{$typeDir}' target='_blank' title='预览'><i class='btn btn-sm fa fa-eye'></i></a>";
                     echo "<a href='catalog_edit.php?id={$id}' title='修改'><i class='btn btn-sm fa fa-pencil-square-o'></i></a>";

src/system/typelink/typeunit.class.menu.php

@@ -1,7 +1,7 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
 /**
- * 后台栏目管理选择框
+ * 后台栏目管理
  *
  * @version        $id:typeunit.class.menu.php 15:21 2010年7月5日 tianya $
  * @package        DedeBIZ.Libraries
@@ -10,13 +10,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * @link           https://www.dedebiz.com
  */
 require_once(DEDEDATA."/cache/inc_catalog_base.inc");
-/**
- * 后台栏目管理选择框
- *
- * @package          TypeUnit
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class TypeUnit
 {
     var $dsql;

src/system/typelink/typeunit.class.selector.php

@@ -1,7 +1,7 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
 /**
- * 后台栏目管理选择框
+ * 后台栏目管理
  *
  * @version        $id:typeunit.class.selector.php 15:21 2010年7月5日 tianya $
  * @package        DedeBIZ.Libraries
@@ -10,13 +10,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
  * @link           https://www.dedebiz.com
  */
 require_once(DEDEDATA."/cache/inc_catalog_base.inc");
-/**
- * 后台栏目管理选择框
- *
- * @package          TypeUnitSelector
- * @subpackage       DedeBIZ.Libraries
- * @link             https://www.dedebiz.com
- */
 class TypeUnitSelector
 {
     var $dsql;
@@ -75,8 +68,8 @@ class TypeUnitSelector
             $id = $row->id;
             $channeltype = $row->channeltype;
             $ischeck = in_array($id, $oldvalues) ? ' checked' : '';
-            $chackRadio = "<input type='radio' name='seltypeid' value='{$id}' $ischeck />";
-            if ($targetid == 'typeid2') $chackRadio = "<input type='checkbox' name='seltypeid' id='seltypeid{$id}' value='{$id}' $ischeck />";
+            $chackRadio = "<input type='radio' name='seltypeid' value='{$id}' $ischeck>";
+            if ($targetid == 'typeid2') $chackRadio = "<input type='checkbox' name='seltypeid' id='seltypeid{$id}' value='{$id}' $ischeck>";
             if ((!empty($channel) && $channeltype != $channel) || $ispart != 0) {
                 $chackRadio = '';
             }
@@ -117,8 +110,8 @@ class TypeUnitSelector
             $ispart = $row->ispart;
             $channeltype = $row->channeltype;
             $ischeck = in_array($id, $oldvalues) ? ' checked' : '';
-            $chackRadio = "<input type='radio' name='seltypeid' value='{$row->id}' $ischeck />";
-            if ($targetid == 'typeid2') $chackRadio = "<input type='checkbox' name='seltypeid' id='seltypeid{$id}' value='{$id}' $ischeck />";
+            $chackRadio = "<input type='radio' name='seltypeid' value='{$row->id}' $ischeck>";
+            if ($targetid == 'typeid2') $chackRadio = "<input type='checkbox' name='seltypeid' id='seltypeid{$id}' value='{$id}' $ischeck>";
             if ($ispart != 0) {
                 $chackRadio = '';
             }

src/system/uploadsafe.inc.php

@@ -1,4 +1,6 @@
 <?php
+if (!defined('DEDEINC')) exit('dedebiz');
+if (isset($_FILES['GLOBALS'])) exit('Request not allow!');
 /**
  * 文件上传安全校验方法
  *
@@ -8,8 +10,6 @@
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-if (!defined('DEDEINC')) exit('dedebiz');
-if (isset($_FILES['GLOBALS'])) exit('Request not allow!');
 //为了防止用户通过注入的可能性改动了数据库，这里强制限定的某些文件类型禁止上传
 $cfg_not_allowall = "php|pl|cgi|asp|aspx|jsp|php3|shtm|shtml";
 $keyarr = array('name', 'type', 'tmp_name', 'size');

src/system/userlogin.class.php

@@ -11,8 +11,7 @@ if (!defined('DEDEINC')) exit('dedebiz');
  */
 session_start();
 /**
- *  检验用户是否有权使用某功能，这个函数是一个回值函数
- *  CheckPurview函数只是对他回值的一个处理过程
+ *  检验用户是否有权使用某功能，这个函数是一个回值函数CheckPurview函数只是对他回值的一个处理过程
  *
  * @access    public
  * @param     string  $n  功能名称