From cfceac945fdb73331d425f3f44e327b063bec9e5 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?= Date: Sat, 30 Nov 2024 21:31:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/inc/inc_catalog_options.php | 4 ++-- src/admin/inc/inc_list_functions.php | 2 +- src/system/dedetemplate.class.php | 11 +++-------- src/system/extend.func.php | 2 +- src/system/taglib/arclist.lib.php | 6 +++--- src/system/taglib/arclistsg.lib.php | 2 +- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/admin/inc/inc_catalog_options.php b/src/admin/inc/inc_catalog_options.php index fea889c4..635a8b57 100644 --- a/src/admin/inc/inc_catalog_options.php +++ b/src/admin/inc/inc_catalog_options.php @@ -60,8 +60,8 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) $sonCats = ''; LogicGetOptionArray($row->id, '─', $channeltype, $dsql, $sonCats); if ($sonCats != '') { - if ($row->ispart == 1) $OptionArrayList .= ""; - else if ($row->ispart == 2) $OptionArrayList .= ""; + if ($row->ispart == 1) $OptionArrayList .= ""; + else if ($row->ispart == 2) $OptionArrayList .= ""; else if (empty($channeltype) && $row->ispart != 0) $OptionArrayList .= ""; else $OptionArrayList .= ""; $OptionArrayList .= $sonCats; diff --git a/src/admin/inc/inc_list_functions.php b/src/admin/inc/inc_list_functions.php index 160000ff..d78d0585 100644 --- a/src/admin/inc/inc_list_functions.php +++ b/src/admin/inc/inc_list_functions.php @@ -41,7 +41,7 @@ function IsCommendArchives($iscommend) global $arcatts; $sn = ''; foreach ($arcatts as $k => $v) { - $v = cn_substr($v, 2); + $v = cn_substr($v, 8); $sn .= (preg_match("#".$k."#", $iscommend) ? ' '.$v : ''); } $sn = trim($sn); diff --git a/src/system/dedetemplate.class.php b/src/system/dedetemplate.class.php index 69ae4260..5af5ea53 100755 --- a/src/system/dedetemplate.class.php +++ b/src/system/dedetemplate.class.php @@ -309,8 +309,7 @@ class DedeTemplate //模板解析时间 //echo ExecTime() - $t1; } else { - //如果存在config文件，则载入此文件，该文件用于保存 $this->tpCfgs的文档，以供扩展用途 - //模板中用“{tag:config name=''/}”来设定该值 + //如果存在config文件，则载入此文件，该文件用于保存 $this->tpCfgs的文档，以供扩展用途，模板中用“{tag:config name=''/}”来设定该值 if (file_exists($this->configFile)) { include($this->configFile); } @@ -344,8 +343,7 @@ class DedeTemplate return $this->cacheFile; } /** - * 显示文档，由于函数中会重新解压一次$GLOBALS变量，所以在动态页中，应该尽量少用本方法， - * 取代之是直接在程序中 include $tpl->CacheFile()，不过include $tpl->CacheFile()这种方式不能在类或函数内使用 + * 显示文档，由于函数中会重新解压一次$GLOBALS变量，所以在动态页中，应该尽量少用本方法，取代之是直接在程序中 include $tpl->CacheFile()，不过include $tpl->CacheFile()这种方式不能在类或函数内使用 * * @access public * @param string @@ -378,8 +376,6 @@ class DedeTemplate fclose($fp); } /** - * CheckDisabledFunctions - * * COMMENT : CheckDisabledFunctions : 检查是否存在禁止的函数 * * @access public @@ -663,8 +659,7 @@ class DedeTemplate $tagname = $cTag->tagName; $varname = $cTag->GetAtt('name'); $rsvalue = ''; - //用于在模板中设置一个变量以提供作扩展用途 - //此变量直接提交到 this->tpCfgs 中，并会生成与模板对应的缓存文件 ***_config.php 文件 + //用于在模板中设置一个变量以提供作扩展用途，此变量直接提交到 this->tpCfgs 中，并会生成与模板对应的缓存文件 ***_config.php 文件 if ($tagname == 'config') { $this->tpCfgs[$varname] = $cTag->GetAtt('value'); } else if ($tagname == 'global') { diff --git a/src/system/extend.func.php b/src/system/extend.func.php index 603b2f87..57053ca0 100755 --- a/src/system/extend.func.php +++ b/src/system/extend.func.php @@ -31,7 +31,7 @@ if (!function_exists('obtaintags')) { $dsql->Execute('tag', $query); while($row = $dsql->GetArray('tag')) { $link = $cfg_cmspath."/apps/tags.php?/{$row['tid']}"; - $tags .= ($tags == '' ? "{$row['tag']} " : "{$row['tag']} "); + $tags .= ($tags == '' ? "{$row['tag']}" : "、{$row['tag']}"); } return $tags; } diff --git a/src/system/taglib/arclist.lib.php b/src/system/taglib/arclist.lib.php index 5b91d5b6..cbbd985e 100755 --- a/src/system/taglib/arclist.lib.php +++ b/src/system/taglib/arclist.lib.php @@ -31,7 +31,7 @@ function lib_arclist(&$ctag, &$refObj) } else { $tagid = $ctag->GetAtt('tagid'); } - //arclist是否需要weight排序,默认为"N",如果需要排序则设置为"Y" + //arclist是否需要weight排序，默认为"N"，如果需要排序则设置为"Y" $isweight = $ctag->GetAtt('isweight'); if ($tagname == 'imglist' || $tagname == 'imginfolist') { $listtype = 'image'; @@ -130,7 +130,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele $colWidth = ceil(100 / $col); $tablewidth = $tablewidth."%"; $colWidth = $colWidth."%"; - //记录属性,以便分页样式统一调用 + //记录属性，以便分页样式统一调用 $attarray = compact('row', 'titlelen', 'infolen', 'imgwidth', 'imgheight', 'listtype', 'arcid', 'channelid', 'orderby', 'orderWay', 'subday', 'pagesize', 'orderby', 'keyword', 'tablewidth', 'col', 'colWidth'); if ($innertext == '') $innertext = GetSysTemplets('part_arclist.htm'); if (@$ctag->GetAtt('getall') == 1) $getall = 1; @@ -140,7 +140,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele if ($att == '1') $att = 'h'; $orwheres = array(); $maintable = '#@__archives'; - //按不同情况设定SQL条件 排序方式 + //按不同情况设定SQL条件排序方式 if ($idlist == '') { if ($orderby == 'near' && $cfg_keyword_like == 'N') { $keyword = ''; diff --git a/src/system/taglib/arclistsg.lib.php b/src/system/taglib/arclistsg.lib.php index 7b398df3..fe8a56c5 100755 --- a/src/system/taglib/arclistsg.lib.php +++ b/src/system/taglib/arclistsg.lib.php @@ -57,7 +57,7 @@ function lib_arclistsg(&$ctag, &$refObj) } $arclistquery = join(',', $listarcs); $arclistquery .= ",arc.aid AS id,arc.senddate AS pubdate"; - //按不同情况设定SQL条件 排序方式 + //按不同情况设定SQL条件排序方式 if ($idlist == '') { if ($orderby == 'near' && $cfg_keyword_like == 'N') { $keyword = '';