diff --git a/src/system/taglib/adminname.lib.php b/src/system/taglib/adminname.lib.php
index b05f06a3..55ac5ac2 100755
--- a/src/system/taglib/adminname.lib.php
+++ b/src/system/taglib/adminname.lib.php
@@ -10,7 +10,7 @@ if (!defined('DEDEINC')) exit ('dedebiz');
* @link https://www.dedebiz.com
*/
/**
- * 编辑标签
+ * adminname解析标签
*
* @access public
* @param object $ctag 解析标签
diff --git a/src/system/taglib/arclist.lib.php b/src/system/taglib/arclist.lib.php
index 486d8e30..717956d4 100755
--- a/src/system/taglib/arclist.lib.php
+++ b/src/system/taglib/arclist.lib.php
@@ -396,12 +396,10 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele
'weight' => $row['weight'],
'arclist' => $liststr
);
- }//if hasRow
- else {
+ } else {
$artlist .= '';
}
- //进行判断,如果启用排序则文档输出为重新排序后的文档
- //var_dump($isweight=='y' && count($orderWeight) == $line);
+ //进行判断,如果启用排序则文档输出为重新排序后的文档var_dump($isweight=='y' && count($orderWeight) == $line);
$isweight = strtolower($isweight);
if ($isweight == 'y') {
$artlist = '';
@@ -412,14 +410,14 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele
}
}
if ($col > 1) $artlist .= "\r\n";
- }//Loop Col
+ }
if ($col > 1) $i += $col - 1;
if ($col > 1) $artlist .= "\r\n";
- }//loop line
+ }
if ($col > 1) $artlist .= "\r\n";
$dsql->FreeResult("al");
$idsstr = join(',', $ids);
- //保存ID缓存
+ //保存id缓存
if ($needSaveCache) {
if ($idsstr == '') $idsstr = '0';
if ($cfg_cache_type == 'content' && $idsstr != '0') {
diff --git a/src/system/taglib/arclistsg.lib.php b/src/system/taglib/arclistsg.lib.php
index a0d680f0..3e6d33f2 100755
--- a/src/system/taglib/arclistsg.lib.php
+++ b/src/system/taglib/arclistsg.lib.php
@@ -1,7 +1,7 @@
GetResult()."\r\n";
- } //if hasRow
- else {
+ } else {
$artlist .= '';
}
if ($col > 1) $artlist .= "\r\n";
- } //Loop Col
+ }
if ($col > 1) $i += $col - 1;
- } //loop line
+ }
$dsql->FreeResult("al");
- //保存ID缓存
+ //保存id缓存
$idsstr = join(',', $ids);
if ($idsstr != '' && $needcache && $cfg_index_cache > 0) {
$mintime = time() - ($cfg_index_cache * 3600);
diff --git a/src/system/taglib/autochannel.lib.php b/src/system/taglib/autochannel.lib.php
index 9180f2d1..d22a25b6 100755
--- a/src/system/taglib/autochannel.lib.php
+++ b/src/system/taglib/autochannel.lib.php
@@ -1,7 +1,7 @@
1) $likeType .= "\r\n";
$GLOBALS['autoindex']++;
- }//Loop Col
+ }
if ($col > 1) {
$i += $col - 1;
$likeType .= "\r\n";
}
- }//Loop for $i
+ }
$dsql->FreeResult();
if ($cacheid != '') {
WriteCacheBlock($cacheid, $likeType);
diff --git a/src/system/taglib/channelartlist.lib.php b/src/system/taglib/channelartlist.lib.php
index bb4f1506..1543b265 100755
--- a/src/system/taglib/channelartlist.lib.php
+++ b/src/system/taglib/channelartlist.lib.php
@@ -1,7 +1,7 @@
GetInnerText()) == '') $innertext = "
[field:typename/]";
+ if (trim($ctag->GetInnerText()) == '') $innertext = "[field:typename/]";
else $innertext = $ctag->GetInnerText();
if (!isset($type)) $type = '';
$dtp = new DedeTagParse();
@@ -34,7 +34,7 @@ function lib_flinktype(&$ctag, &$refObj)
}
$DedeBIZ = new stdClass;
$DedeBIZ->id = 999;
- $DedeBIZ->typename = 'Dede链';
+ $DedeBIZ->typename = 'DedeBIZ';
if ($type == 'DedeBIZ') $row[] = $DedeBIZ;
foreach ($row as $key => $value) {
if (is_array($dtp->CTags)) {
diff --git a/src/system/taglib/help/arclistsg.txt b/src/system/taglib/help/arclistsg.txt
index 3d3b799a..747bd281 100755
--- a/src/system/taglib/help/arclistsg.txt
+++ b/src/system/taglib/help/arclistsg.txt
@@ -1,4 +1,4 @@
-自定义模型列表标签
+自定义文档列表标签
>>dede>>
{dede:arclistsg typeid='' row='' col='' titlelen='' flag='h' orderway='' keyword='' limit='0,1'}
[field:title/]
diff --git a/src/system/taglib/help/autochannel.txt b/src/system/taglib/help/autochannel.txt
index e0459eb1..f8eb3061 100755
--- a/src/system/taglib/help/autochannel.txt
+++ b/src/system/taglib/help/autochannel.txt
@@ -1,4 +1,4 @@
-按排序位置获取单个栏目链接信息
+指定排序栏目信息标签
>>dede>>
{dede:autochannel partsort='' typeid=''}{/dede:autochannel}
>>dede>>
diff --git a/src/system/taglib/help/channelartlist.txt b/src/system/taglib/help/channelartlist.txt
index bc44a59b..65677bdf 100755
--- a/src/system/taglib/help/channelartlist.txt
+++ b/src/system/taglib/help/channelartlist.txt
@@ -1,4 +1,4 @@
-当前栏目下级栏目文档列表标签
+当前栏目列表标签
>>dede>>
{dede:channelartlist typeid='' notypeid='' row='6'}
diff --git a/src/system/taglib/help/hotwords.txt b/src/system/taglib/help/hotwords.txt
index 73d3982d..9949195c 100755
--- a/src/system/taglib/help/hotwords.txt
+++ b/src/system/taglib/help/hotwords.txt
@@ -1,4 +1,4 @@
-网站搜索热门关键词标签
+热搜标签
>>dede>>
{dede:hotwords/}
>>dede>>
diff --git a/src/system/taglib/help/infoguide.txt b/src/system/taglib/help/infoguide.txt
index 46bce9b8..b4113aed 100755
--- a/src/system/taglib/help/infoguide.txt
+++ b/src/system/taglib/help/infoguide.txt
@@ -1,4 +1,4 @@
-分类信息地区与小分类搜索标签
+分类信息地区搜索标签
>>dede>>
{dede:infoguide/}
>>dede>>
\ No newline at end of file
diff --git a/src/system/taglib/help/infolink.txt b/src/system/taglib/help/infolink.txt
index 4ba5d511..e2a9f0cd 100755
--- a/src/system/taglib/help/infolink.txt
+++ b/src/system/taglib/help/infolink.txt
@@ -1,4 +1,4 @@
-分类信息地区与类型快捷链接标签
+分类信息地区链接标签
>>dede>>
{dede:infolink/}
>>dede>>
\ No newline at end of file
diff --git a/src/system/taglib/help/mytag.txt b/src/system/taglib/help/mytag.txt
index ea3af933..2d769e85 100755
--- a/src/system/taglib/help/mytag.txt
+++ b/src/system/taglib/help/mytag.txt
@@ -1,4 +1,4 @@
-自定义宏标标签
+自定义宏标记标签
>>dede>>
{dede:mytag typeid='0' name=''/}
>>dede>>
diff --git a/src/system/taglib/help/type.txt b/src/system/taglib/help/type.txt
index 6548da18..62e2bcd5 100755
--- a/src/system/taglib/help/type.txt
+++ b/src/system/taglib/help/type.txt
@@ -1,4 +1,4 @@
-指定单个栏目数据标签
+指定栏目信息标签
>>dede>>
{dede:type typeid=''}
[field:typename/]
diff --git a/src/system/taglib/hotwords.lib.php b/src/system/taglib/hotwords.lib.php
index c1d95dbf..ad883d31 100755
--- a/src/system/taglib/hotwords.lib.php
+++ b/src/system/taglib/hotwords.lib.php
@@ -1,7 +1,7 @@
CAttribute->Items,$attlist);
- //extract($ctag->CAttribute->Items, EXTR_SKIP);
if (empty($refObj->Fields['typeid'])) {
$row = $dsql->GetOne("SELECT id FROM `#@__arctype` WHERE channeltype='-8' And reid = '0' ");
$typeid = (is_array($row) ? $row['id'] : 0);
diff --git a/src/system/taglib/infolink.lib.php b/src/system/taglib/infolink.lib.php
index ad7a8ee9..54e588a2 100755
--- a/src/system/taglib/infolink.lib.php
+++ b/src/system/taglib/infolink.lib.php
@@ -1,7 +1,7 @@
3) break;
-
if (trim($k) == '') continue;
else $k = addslashes($k);
-
$keyword .= ($keyword == '' ? " CONCAT(arc.keywords,' ',arc.title) LIKE '%$k%' " : " OR CONCAT(arc.keywords,' ',arc.title) LIKE '%$k%' ");
$n++;
}
@@ -65,12 +63,12 @@ function lib_likearticle(&$ctag, &$refObj)
if (!empty($typeid)) {
$typeid = " AND arc.typeid IN($typeid) AND arc.id<>$arcid ";
}
- $query = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id WHERE arc.arcrank>-1 AND ($keyword) $typeid $orderquery limit 0, $row";
+ $query = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id WHERE arc.arcrank>-1 AND ($keyword) $typeid $orderquery limit 0, $row";
} else {
if (!empty($typeid)) {
$typeid = " arc.typeid IN($typeid) AND arc.id<>$arcid ";
}
- $query = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id WHERE arc.arcrank>-1 AND $typeid $orderquery limit 0, $row";
+ $query = "SELECT arc.*,tp.typedir,tp.typename,tp.corank,tp.isdefault,tp.defaultname,tp.namerule,tp.namerule2,tp.ispart,tp.moresite,tp.siteurl,tp.sitepath FROM `#@__archives` arc LEFT JOIN `#@__arctype` tp ON arc.typeid=tp.id WHERE arc.arcrank>-1 AND $typeid $orderquery limit 0, $row";
}
$innertext = trim($ctag->GetInnerText());
if ($innertext == '') $innertext = GetSysTemplets('part_arclist.htm');
@@ -154,18 +152,14 @@ function lib_likearticle(&$ctag, &$refObj)
$GLOBALS['autoindex']++;
}
$artlist .= $dtp2->GetResult()."\r\n";
- }
- //if hasRow
- else {
+ } else {
$artlist .= '';
}
if ($col > 1) $artlist .= "\r\n";
}
- //Loop Col
if ($col > 1) $i += $col - 1;
if ($col > 1) $artlist .= "\r\n";
}
- //loop line
if ($col > 1) $artlist .= "\r\n";
$dsql->FreeResult("al");
return $artlist;
diff --git a/src/system/taglib/relation.lib.php b/src/system/taglib/relation.lib.php
index 3aa25e94..7af5d7d4 100644
--- a/src/system/taglib/relation.lib.php
+++ b/src/system/taglib/relation.lib.php
@@ -138,20 +138,15 @@ function lib_relation(&$ctag, &$refObj)
}
$GLOBALS['autoindex']++;
}
-
$artlist .= $dtp2->GetResult()."\r\n";
- }
- //if hasRow
- else {
+ } else {
$artlist .= '';
}
if ($col > 1) $artlist .= "\r\n";
}
- //Loop Col
if ($col > 1) $i += $col - 1;
if ($col > 1) $artlist .= "\r\n";
}
- //loop line
if ($col > 1) $artlist .= "\r\n";
$dsql->FreeResult("al");
return $artlist;
diff --git a/src/system/taglib/softmsg.lib.php b/src/system/taglib/softmsg.lib.php
index 9b6fd54c..f47b6b73 100755
--- a/src/system/taglib/softmsg.lib.php
+++ b/src/system/taglib/softmsg.lib.php
@@ -12,9 +12,6 @@ if (!defined('DEDEINC')) exit ('dedebiz');
function lib_softmsg(&$ctag, &$refObj)
{
global $dsql;
- //$attlist="type|textall,row|30,titlelen|30,linktype|1";
- //FillAttsDefault($ctag->CAttribute->Items,$attlist);
- //extract($ctag->CAttribute->Items, EXTR_SKIP);
$revalue = '';
$row = $dsql->GetOne(" SELECT * FROM `#@__softconfig`");
if (is_array($row)) $revalue = $row['downmsg'];
diff --git a/src/system/taglib/sonchannel.lib.php b/src/system/taglib/sonchannel.lib.php
index 3503a012..0b25e5cd 100755
--- a/src/system/taglib/sonchannel.lib.php
+++ b/src/system/taglib/sonchannel.lib.php
@@ -44,12 +44,12 @@ function lib_sonchannel(&$ctag, &$refObj)
}
if ($col > 1) $likeType .= "\r\n";
$GLOBALS['autoindex']++;
- } //Loop Col
+ }
if ($col > 1) {
$i += $col - 1;
$likeType .= "\r\n";
}
- } //Loop for $i
+ }
$dsql->FreeResult();
return $likeType;
}
diff --git a/src/system/taglib/type.lib.php b/src/system/taglib/type.lib.php
index be8ea50d..391be5df 100755
--- a/src/system/taglib/type.lib.php
+++ b/src/system/taglib/type.lib.php
@@ -1,7 +1,7 @@
CTags as $tagid=>$ctag)
{
- if (isset($row[$ctag->GetName()])){
+ if (isset($row[$ctag->GetName()])) {
$ctp->Assign($tagid,$row[$ctag->GetName()]);
}
}