From e9b5291f4ccdce0d36ec058180c93debca0c1d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Mon, 19 Dec 2022 10:20:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=EF=BC=8C=E6=B7=BB=E5=8A=A06.2.X=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=89=B9=E5=BE=81=EF=BC=8C=E4=BC=98=E5=8C=96=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/catalog_do.php | 4 ++-- src/admin/mychannel_edit.php | 4 ++-- src/admin/swfupload.php | 2 +- src/system/archive/archives.class.php | 7 ------- src/system/archive/freelist.class.php | 11 ++-------- src/system/archive/listview.class.php | 7 ------- src/system/archive/partview.class.php | 7 ------- src/system/archive/searchview.class.php | 7 ------- src/system/archive/sglistview.class.php | 9 +------- src/system/archive/sgpage.class.php | 9 +------- src/system/archive/specview.class.php | 7 ------- src/system/archive/taglist.class.php | 9 +------- src/system/channelunit.class.php | 8 +++---- src/system/database/dedesqli.class.php | 3 +-- src/system/database/dedesqlite.class.php | 3 +-- src/system/dedeatt.class.php | 8 ------- src/system/dedetag.class.php | 12 ++--------- src/system/dedevote.class.php | 7 ------- src/system/diyform.class.php | 7 ------- src/system/helpers/channelunit.helper.php | 2 +- src/system/helpers/util.helper.php | 1 - src/system/taglib/arccontent.lib.php | 10 ++------- src/system/taglib/arclist.lib.php | 10 ++++----- src/system/taglib/arclistsg.lib.php | 4 ++-- src/system/taglib/channel.lib.php | 2 +- src/system/taglib/channel/stepselect.lib.php | 8 +++---- src/system/taglib/flinktype.lib.php | 2 +- src/system/taglib/likearticle.lib.php | 8 +++---- src/system/taglib/memberlist.lib.php | 1 - src/system/taglib/relation.lib.php | 8 +++---- src/system/taglib/sonchannel.lib.php | 2 +- src/system/taglib/statistics.lib.php | 2 +- src/system/tpllib/plus_channel.php | 2 +- src/system/typelink/typelink.class.php | 15 ++++--------- src/system/typelink/typeunit.class.admin.php | 21 +++++++------------ src/system/typelink/typeunit.class.menu.php | 9 +------- .../typelink/typeunit.class.selector.php | 17 +++++---------- src/system/uploadsafe.inc.php | 4 ++-- src/system/userlogin.class.php | 3 +-- 39 files changed, 64 insertions(+), 198 deletions(-) diff --git a/src/admin/catalog_do.php b/src/admin/catalog_do.php index dfb1ec79..7a0a76c0 100644 --- a/src/admin/catalog_do.php +++ b/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 " \r\n"; + echo "
\r\n"; $tu->LogicListAllSunType($cid, "　"); - echo "
\r\n"; + echo "\r\n"; $tu->Close(); } /*---------------- diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php index 831c0193..a472110c 100644 --- a/src/admin/mychannel_edit.php +++ b/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) { diff --git a/src/admin/swfupload.php b/src/admin/swfupload.php index fefe77f7..9e509235 100644 --- a/src/admin/swfupload.php +++ b/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])) { diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php index 05c7d9c5..d392b40f 100755 --- a/src/system/archive/archives.class.php +++ b/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; diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php index eac1b580..fa3439a0 100755 --- a/src/system/archive/freelist.class.php +++ b/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 .= " \r\n"; + $artlist .= "\r\n"; } } //Loop Col if ($col > 1) { $i += $col - 1; } if ($col > 1) { - $artlist .= " \r\n"; + $artlist .= "\r\n"; } } //Loop Line if ($col > 1) { diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php index 5405873a..c70c6506 100755 --- a/src/system/archive/listview.class.php +++ b/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; diff --git a/src/system/archive/partview.class.php b/src/system/archive/partview.class.php index 4f7b1e4b..81fa2683 100755 --- a/src/system/archive/partview.class.php +++ b/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; diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php index aebc5007..ed027c3d 100755 --- a/src/system/archive/searchview.class.php +++ b/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; diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php index 6438bd2f..c399be08 100755 --- a/src/system/archive/sglistview.class.php +++ b/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 .= " \r\n"; + $artlist .= "\r\n"; } } //Loop Line $t3 = ExecTime(); diff --git a/src/system/archive/sgpage.class.php b/src/system/archive/sgpage.class.php index 2e729796..dc109e13 100755 --- a/src/system/archive/sgpage.class.php +++ b/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) diff --git a/src/system/archive/specview.class.php b/src/system/archive/specview.class.php index 2e9ece83..3c0b3fbb 100755 --- a/src/system/archive/specview.class.php +++ b/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; diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php index d937428a..4b4d998b 100755 --- a/src/system/archive/taglist.class.php +++ b/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 .= " \r\n"; + $artlist .= "\r\n"; } } //Loop Line $this->dsql->FreeResult('al'); diff --git a/src/system/channelunit.class.php b/src/system/channelunit.class.php index 6c3e86d6..84e40053 100755 --- a/src/system/channelunit.class.php +++ b/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) diff --git a/src/system/database/dedesqli.class.php b/src/system/database/dedesqli.class.php index 6a54d099..abc97bad 100755 --- a/src/system/database/dedesqli.class.php +++ b/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; diff --git a/src/system/database/dedesqlite.class.php b/src/system/database/dedesqlite.class.php index 9e1e0108..2de449f3 100755 --- a/src/system/database/dedesqlite.class.php +++ b/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数据库类 diff --git a/src/system/dedeatt.class.php b/src/system/dedeatt.class.php index 78f7e763..e3a7a2db 100755 --- a/src/system/dedeatt.class.php +++ b/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; diff --git a/src/system/dedetag.class.php b/src/system/dedetag.class.php index 9693d7c4..eb8220b6 100755 --- a/src/system/dedetag.class.php +++ b/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 diff --git a/src/system/dedevote.class.php b/src/system/dedevote.class.php index 44cfaf6a..299f1586 100755 --- a/src/system/dedevote.class.php +++ b/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; diff --git a/src/system/diyform.class.php b/src/system/diyform.class.php index b089f02b..e9529198 100755 --- a/src/system/diyform.class.php +++ b/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; diff --git a/src/system/helpers/channelunit.helper.php b/src/system/helpers/channelunit.helper.php index e4244421..8f7f83f2 100755 --- a/src/system/helpers/channelunit.helper.php +++ b/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) diff --git a/src/system/helpers/util.helper.php b/src/system/helpers/util.helper.php index 1b90f36b..9b0c5da3 100755 --- a/src/system/helpers/util.helper.php +++ b/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) { diff --git a/src/system/taglib/arccontent.lib.php b/src/system/taglib/arccontent.lib.php index 9938c55f..c9dcb68e 100644 --- a/src/system/taglib/arccontent.lib.php +++ b/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']}"); diff --git a/src/system/taglib/arclist.lib.php b/src/system/taglib/arclist.lib.php index f1ef6b01..3e3f613e 100755 --- a/src/system/taglib/arclist.lib.php +++ b/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 .= "
\r\n"; + if ($pagesize > 0) $artlist .= "
\r\n"; if ($col > 1) $artlist = "\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 .= "\r\n"; for ($j = 0; $j < $col; $j++) { - if ($col > 1) $artlist .= " \r\n"; + if ($col > 1) $artlist .= "\r\n"; }//Loop Col if ($col > 1) $i += $col - 1; - if ($col > 1) $artlist .= " \r\n"; + if ($col > 1) $artlist .= "\r\n"; }//loop line - if ($col > 1) $artlist .= "
\r\n"; + if ($col > 1) $artlist .= "\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 .= "
\r\n"; + if ($col > 1) $artlist .= "\r\n"; $dsql->FreeResult("al"); $idsstr = join(',', $ids); //保存ID缓存 diff --git a/src/system/taglib/arclistsg.lib.php b/src/system/taglib/arclistsg.lib.php index 397f16c6..88cb6d79 100755 --- a/src/system/taglib/arclistsg.lib.php +++ b/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 .= "
\r\n"; + if ($col > 1) $artlist .= "
\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 .= "
\r\n"; + if ($col > 1) $artlist .= "
\r\n"; } //Loop Col if ($col > 1) $i += $col - 1; } //loop line diff --git a/src/system/taglib/channel.lib.php b/src/system/taglib/channel.lib.php index ee1af800..c123575d 100755 --- a/src/system/taglib/channel.lib.php +++ b/src/system/taglib/channel.lib.php @@ -109,7 +109,7 @@ function lib_channel(&$ctag, &$refObj) }//Loop Col if ($col > 1) { $i += $col - 1; - $likeType .= " \r\n"; + $likeType .= "\r\n"; } }//Loop for $i $dsql->FreeResult(); diff --git a/src/system/taglib/channel/stepselect.lib.php b/src/system/taglib/channel/stepselect.lib.php index a0bb5bd8..be9d0c22 100755 --- a/src/system/taglib/channel/stepselect.lib.php +++ b/src/system/taglib/channel/stepselect.lib.php @@ -1,9 +1,5 @@ 1) $artlist .= "\r\n"; for ($j = 0; $j < $col; $j++) { - if ($col > 1) $artlist .= " \r\n"; + if ($col > 1) $artlist .= "\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 .= " \r\n"; + if ($col > 1) $artlist .= "\r\n"; } //Loop Col if ($col > 1) $i += $col - 1; - if ($col > 1) $artlist .= " \r\n"; + if ($col > 1) $artlist .= "\r\n"; } //loop line - if ($col > 1) $artlist .= " \r\n"; + if ($col > 1) $artlist .= "\r\n"; $dsql->FreeResult("al"); return $artlist; } diff --git a/src/system/taglib/memberlist.lib.php b/src/system/taglib/memberlist.lib.php index d93a6686..6b733075 100755 --- a/src/system/taglib/memberlist.lib.php +++ b/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; diff --git a/src/system/taglib/relation.lib.php b/src/system/taglib/relation.lib.php index c225b352..45002b45 100644 --- a/src/system/taglib/relation.lib.php +++ b/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 .= "\r\n"; for ($j = 0; $j < $col; $j++) { - if ($col > 1) $artlist .= " \r\n"; + if ($col > 1) $artlist .= "\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 .= " \r\n"; + if ($col > 1) $artlist .= "\r\n"; } //Loop Col if ($col > 1) $i += $col - 1; - if ($col > 1) $artlist .= " \r\n"; + if ($col > 1) $artlist .= "\r\n"; } //loop line - if ($col > 1) $artlist .= " \r\n"; + if ($col > 1) $artlist .= "\r\n"; $dsql->FreeResult("al"); return $artlist; } diff --git a/src/system/taglib/sonchannel.lib.php b/src/system/taglib/sonchannel.lib.php index 59213ed3..988340e1 100755 --- a/src/system/taglib/sonchannel.lib.php +++ b/src/system/taglib/sonchannel.lib.php @@ -46,7 +46,7 @@ function lib_sonchannel(&$ctag, &$refObj) } //Loop Col if ($col > 1) { $i += $col - 1; - $likeType .= " \r\n"; + $likeType .= "\r\n"; } } //Loop for $i $dsql->FreeResult(); diff --git a/src/system/taglib/statistics.lib.php b/src/system/taglib/statistics.lib.php index b0e2dd24..3980e098 100755 --- a/src/system/taglib/statistics.lib.php +++ b/src/system/taglib/statistics.lib.php @@ -1,6 +1,5 @@ \r\n"; } for ($j = 0; $j < $col; $j++) { - if ($col > 1) $likeType .= " \r\n"; + if ($col > 1) $likeType .= "\r\n"; if ($row = $this->dsql->GetArray()) { //处理当前栏目的样式 if ($row['id'] == "$typeid" && $myinnertext != '') { @@ -336,7 +329,7 @@ class TypeLink } } if ($col > 1) { - $likeType .= " \r\n"; + $likeType .= "\r\n"; } $GLOBALS['autoindex']++; }//Loop Col @@ -344,11 +337,11 @@ class TypeLink $i += $col - 1; } if ($col > 1) { - $likeType .= " \r\n"; + $likeType .= "\r\n"; } }//Loop for $i if ($col > 1) { - $likeType .= " \r\n"; + $likeType .= "\r\n"; } $this->dsql->FreeResult(); return $likeType; diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index e6c61e30..27178831 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/src/system/typelink/typeunit.class.admin.php @@ -1,7 +1,7 @@ "; - echo "
列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; + echo ""; - echo "
列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; echo ""; echo ""; echo ""; @@ -130,7 +123,7 @@ class TypeUnit //带封面的栏目 else if ($ispart == 1) { echo "
封面{$nss}".$typeName."[id：".$id."]"; + echo ""; - echo "
封面{$nss}".$typeName."[id：".$id."]"; echo ""; echo ""; echo ""; @@ -143,7 +136,7 @@ class TypeUnit //独立页面 else if ($ispart == 2) { echo "
外部{$nss}".$typeName."[id：".$id."]"; + echo ""; echo "
外部{$nss}".$typeName."[id：".$id."]"; echo ""; echo ""; echo ""; @@ -200,7 +193,7 @@ class TypeUnit if ($ispart == 0) { echo "
"; echo "
"; - echo "$step列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; + echo "$step列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; echo ""; echo ""; echo ""; @@ -214,7 +207,7 @@ class TypeUnit else if ($ispart == 1) { echo "
"; echo "
"; - echo "$step封面{$nss}".$typeName."[id：".$id."]"; + echo "$step封面{$nss}".$typeName."[id：".$id."]"; echo ""; echo ""; echo ""; @@ -228,7 +221,7 @@ class TypeUnit else if ($ispart == 2) { echo "
"; - echo "$step外部{$nss}".$typeName."[id：".$id."]"; + echo "$step外部{$nss}".$typeName."[id：".$id."]"; echo ""; echo ""; echo ""; diff --git a/src/system/typelink/typeunit.class.menu.php b/src/system/typelink/typeunit.class.menu.php index 25bc823d..2e14ceb4 100755 --- a/src/system/typelink/typeunit.class.menu.php +++ b/src/system/typelink/typeunit.class.menu.php @@ -1,7 +1,7 @@ id; $channeltype = $row->channeltype; $ischeck = in_array($id, $oldvalues) ? ' checked' : ''; - $chackRadio = ""; - if ($targetid == 'typeid2') $chackRadio = ""; + $chackRadio = ""; + if ($targetid == 'typeid2') $chackRadio = ""; 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 = ""; - if ($targetid == 'typeid2') $chackRadio = ""; + $chackRadio = ""; + if ($targetid == 'typeid2') $chackRadio = ""; if ($ispart != 0) { $chackRadio = ''; } diff --git a/src/system/uploadsafe.inc.php b/src/system/uploadsafe.inc.php index c397657a..f3c146ca 100755 --- a/src/system/uploadsafe.inc.php +++ b/src/system/uploadsafe.inc.php @@ -1,4 +1,6 @@