From d6cd01c3ad0d1bb43ee5d0b850ae3a5085731e7e 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, 11 Jan 2025 16:53:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9E=83=E5=9C=BE=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/catalog_add.php | 2 +- src/admin/catalog_edit.php | 3 +-- src/admin/inc/inc_batchup.php | 2 +- src/admin/inc/inc_menu_func.php | 2 +- src/system/archive/archives.class.php | 8 ++++---- src/system/archive/freelist.class.php | 2 +- src/system/archive/listview.class.php | 2 +- src/system/archive/partview.class.php | 2 +- src/system/archive/searchview.class.php | 2 +- src/system/archive/sglistview.class.php | 2 +- src/system/archive/sgpage.class.php | 2 +- src/system/archive/specview.class.php | 4 ++-- src/system/archive/taglist.class.php | 2 +- src/system/channelunit.class.php | 2 +- src/system/dedeatt.class.php | 2 +- src/system/dedecollection.func.php | 6 +++--- src/system/dedeimage.class.php | 2 +- src/system/dedemodule.class.php | 6 +++--- src/system/dedetag.class.php | 16 ++++++++-------- src/system/dedetemplate.class.php | 10 +++++----- src/system/dedevote.class.php | 2 +- src/system/diyform.class.php | 2 +- src/system/libraries/dedehttpdown.class.php | 2 +- src/system/libraries/mail.class.php | 2 +- src/system/libraries/oxwindow.class.php | 2 +- src/system/libraries/splitword.class.php | 8 ++++---- src/system/memberlogin.class.php | 2 +- src/system/typelink/typelink.class.php | 8 ++++---- src/system/typelink/typeunit.class.admin.php | 2 +- src/system/typelink/typeunit.class.menu.php | 2 +- src/system/typelink/typeunit.class.selector.php | 2 +- 31 files changed, 56 insertions(+), 57 deletions(-) diff --git a/src/admin/catalog_add.php b/src/admin/catalog_add.php index 53518566..6b88ce34 100644 --- a/src/admin/catalog_add.php +++ b/src/admin/catalog_add.php @@ -184,7 +184,7 @@ if ($dopost == 'quick') { } ShowMsg("成功创建一个栏目", "catalog_main.php"); exit(); -}//End dopost==save +} //获取从父目录继承的默认参数 if ($dopost == '') { $channelid = 1; diff --git a/src/admin/catalog_edit.php b/src/admin/catalog_edit.php index f3824541..11d00f04 100644 --- a/src/admin/catalog_edit.php +++ b/src/admin/catalog_edit.php @@ -56,8 +56,7 @@ if ($dopost == "save") { UpDateCatCache(); ShowMsg("成功修改一个栏目", "catalog_main.php"); exit(); -} //End Save Action -else if ($dopost == "savetime") { +} else if ($dopost == "savetime") { $uptopsql = ''; $slinks = " id IN (".GetSonIds($id).")"; //顶级栏目二级域名根目录处理 diff --git a/src/admin/inc/inc_batchup.php b/src/admin/inc/inc_batchup.php index 3ab12731..158b5a13 100644 --- a/src/admin/inc/inc_batchup.php +++ b/src/admin/inc/inc_batchup.php @@ -57,7 +57,7 @@ function DelArc($aid, $type = 'ON', $onlyfile = FALSE, $recycle = 0) //$issystem==-1是自定义模型，不使用回收站 if ($issystem == -1) $type = 'OK'; if (!is_array($arcRow)) return FALSE; - /** 删除到回收站 **/ + //删除到回收站 if ($cfg_delete == 'Y' && $type == 'ON') { $dsql->ExecuteNoneQuery("UPDATE `$maintable` SET arcrank='-2' WHERE id='$aid' "); $dsql->ExecuteNoneQuery("UPDATE `#@__arctiny` SET `arcrank` = '-2' WHERE id = '$aid';"); diff --git a/src/admin/inc/inc_menu_func.php b/src/admin/inc/inc_menu_func.php index a828e777..dc0bb8e6 100644 --- a/src/admin/inc/inc_menu_func.php +++ b/src/admin/inc/inc_menu_func.php @@ -60,5 +60,5 @@ function GetMenus($userrank, $topos = 'main') echo $footTemplet; } } -}//End Function +} ?> \ No newline at end of file diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php index a8679842..3644c455 100755 --- a/src/system/archive/archives.class.php +++ b/src/system/archive/archives.class.php @@ -183,7 +183,7 @@ class Archives $this->Fields[$nk] = $this->ReplaceKeyword($this->Fields['keywords'], $this->Fields[$nk]); } } - } //End foreach + } } //设置全局环境变量 $this->Fields['typename'] = $this->TypeLink->TypeInfos['typename']; @@ -631,8 +631,8 @@ class Archives } } $this->dtp->Assign($i, $res); - } //end case - } //结束模板循环 + } + } } } /** @@ -1005,7 +1005,7 @@ class Archives $body = preg_replace("#()#isU", '\\1>\\3<\\4', $body); return $body; } -}//End Archives +} function _highlightkeywords($matches) { return _highlight($matches[2], $GLOBALS['_dd_karr'], $GLOBALS['_dd_kaarr'], $matches[1]); diff --git a/src/system/archive/freelist.class.php b/src/system/archive/freelist.class.php index f5e19ce0..158e5803 100755 --- a/src/system/archive/freelist.class.php +++ b/src/system/archive/freelist.class.php @@ -855,5 +855,5 @@ class FreeList } return $nowurl; } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/archive/listview.class.php b/src/system/archive/listview.class.php index f9abfe1b..36624c62 100755 --- a/src/system/archive/listview.class.php +++ b/src/system/archive/listview.class.php @@ -1218,5 +1218,5 @@ class ListView } return $nowurl; } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/archive/partview.class.php b/src/system/archive/partview.class.php index ff09c45e..a1950f81 100755 --- a/src/system/archive/partview.class.php +++ b/src/system/archive/partview.class.php @@ -231,5 +231,5 @@ class PartView function Close() { } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php index abba8b92..31264144 100755 --- a/src/system/archive/searchview.class.php +++ b/src/system/archive/searchview.class.php @@ -721,5 +721,5 @@ class SearchView } return $nowurl; } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php index ba081be3..ef6180ff 100755 --- a/src/system/archive/sglistview.class.php +++ b/src/system/archive/sglistview.class.php @@ -1046,5 +1046,5 @@ class SgListView } return $nowurl; } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/archive/sgpage.class.php b/src/system/archive/sgpage.class.php index dc940625..97f506a7 100755 --- a/src/system/archive/sgpage.class.php +++ b/src/system/archive/sgpage.class.php @@ -99,5 +99,5 @@ class sgpage function Close() { } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/archive/specview.class.php b/src/system/archive/specview.class.php index 5f24c7c7..70b072d5 100755 --- a/src/system/archive/specview.class.php +++ b/src/system/archive/specview.class.php @@ -219,7 +219,7 @@ class SpecView } $this->dtp->Assign($tagid, $this->GetPageListST($list_len)); } - } //End foreach + } $makeFile = $GLOBALS['cfg_special']."/spec_".$this->PageNo.$GLOBALS['art_shortname']; $murl = $makeFile; $makeFile = $GLOBALS['cfg_basedir'].$makeFile; @@ -568,5 +568,5 @@ class SpecView } return $nowurl; } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/archive/taglist.class.php b/src/system/archive/taglist.class.php index db74aea7..03b4745d 100755 --- a/src/system/archive/taglist.class.php +++ b/src/system/archive/taglist.class.php @@ -666,5 +666,5 @@ class TagList } return $nowurl; } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/channelunit.class.php b/src/system/channelunit.class.php index c0cd006f..8b799311 100755 --- a/src/system/channelunit.class.php +++ b/src/system/channelunit.class.php @@ -198,5 +198,5 @@ class ChannelUnit function Close() { } -}//End class ChannelUnit +} ?> \ No newline at end of file diff --git a/src/system/dedeatt.class.php b/src/system/dedeatt.class.php index bd63667c..825657ab 100755 --- a/src/system/dedeatt.class.php +++ b/src/system/dedeatt.class.php @@ -66,7 +66,7 @@ class DedeAtt { return $this->Count + 1; } -}//End DedeAtt +} /** * 属性解析器 * function c____DedeAttParse(); diff --git a/src/system/dedecollection.func.php b/src/system/dedecollection.func.php index 7ed31c80..f2158eda 100644 --- a/src/system/dedecollection.func.php +++ b/src/system/dedecollection.func.php @@ -486,9 +486,9 @@ function GetUrlFromListRule($regxurl = '', $handurl = '', $startid = 0, $endid = } } } - } //End 匹配多栏目 - } //End使用规则匹配的情况 + } + } } return $lists; -}//End +} ?> \ No newline at end of file diff --git a/src/system/dedeimage.class.php b/src/system/dedeimage.class.php index 04b25b12..a347e316 100755 --- a/src/system/dedeimage.class.php +++ b/src/system/dedeimage.class.php @@ -271,5 +271,5 @@ class DedeImage } } } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/dedemodule.class.php b/src/system/dedemodule.class.php index 2eafe809..04ba4fbd 100755 --- a/src/system/dedemodule.class.php +++ b/src/system/dedemodule.class.php @@ -241,7 +241,7 @@ class DedeModule while (!feof($fp)) { $line = fgets($fp, 1024); if (!$start) { - //2011-6-7 修复模块打包程序中上传程序安装生成为空白文件 + //2011-6-7修复模块打包程序中上传程序安装生成为空白文件 if (preg_match("#<{$ntype}>#i", $line)) $start = TRUE; } else { if (preg_match("#<\/{$ntype}#i", $line)) break; @@ -291,7 +291,7 @@ class DedeModule * * @access public * @param string $hashcode hash码 - * @return bool 如果存在则返回True,否则为False + * @return bool 如果存在则返回True，否则为False */ function HasModule($hashcode) { @@ -582,5 +582,5 @@ class DedeModule unset($this->modules); unset($this->fileListNames); } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/dedetag.class.php b/src/system/dedetag.class.php index dc7ae224..56aeb241 100755 --- a/src/system/dedetag.class.php +++ b/src/system/dedetag.class.php @@ -16,7 +16,7 @@ class DedeTag var $InnerText = ''; //标记之间的文本 var $StartPos = 0; //标记起始位置 var $EndPos = 0; //标记结束位置 - var $CAttribute = null; //标记属性描述,即是class DedeAttribute + var $CAttribute = null; //标记属性描述,即是class DedeAttribute var $TagValue = ''; //标记的值 var $TagID = 0; /** @@ -85,7 +85,7 @@ class DedeTagParse var $TempMkTime = 0; var $CacheFile = ''; var $SourceString = ''; //模板字符串 - var $CTags = array(); //标记集合 + var $CTags = array(); //标记集合 var $Count = -1; //$Tags标记个数 var $refObj = ''; //引用当前模板类的对象 var $taghashfile = ''; @@ -385,7 +385,7 @@ class DedeTagParse return -1; } /** - * 获得指定名称的CTag数据类(如果有多个同名的Tag,则取没有被分配文档的第一个Tag) + * 获得指定名称的CTag数据类，如果有多个同名的Tag，则取没有被分配文档的第一个Tag * * @access public * @param string $str 字符串 @@ -602,7 +602,7 @@ class DedeTagParse return $ResultString; } /** - * 把分析模板输出到一个字符串中,并返回 + * 把分析模板输出到一个字符串中并返回 * * @access public * @return string @@ -940,7 +940,7 @@ class DedeAttributeParse $hasAttribute = FALSE; $strLen = strlen($this->sourceString); $this->cAttributes->Items = array(); - //获得Tag的名称，解析到 cAtt->GetAtt('tagname') 中 + //获得Tag的名称，解析到cAtt->GetAtt('tagname')中 for ($i = 0; $i < $strLen; $i++) { if ($this->sourceString[$i] == ' ') { $this->cAttributes->Count++; @@ -967,7 +967,7 @@ class DedeAttributeParse return; } $tmpvalue = ''; - //如果字符串含有属性值，遍历源字符串,并获得各属性 + //如果字符串含有属性值，遍历源字符串并获得各属性 for ($i; $i < $strLen; $i++) { $d = $this->sourceString[$i]; //查找属性名称 @@ -1013,13 +1013,13 @@ class DedeAttributeParse $tmpvalue .= $d; } } - }//for + } //最后一个属性给值 if ($tmpatt != '') { $this->cAttributes->Count++; $this->cAttributes->Items[$tmpatt] = trim($tmpvalue); } //print_r($this->cAttributes->Items); - } //end func + } } ?> \ No newline at end of file diff --git a/src/system/dedetemplate.class.php b/src/system/dedetemplate.class.php index 5af5ea53..586d7664 100755 --- a/src/system/dedetemplate.class.php +++ b/src/system/dedetemplate.class.php @@ -190,7 +190,7 @@ class DedeTemplate $this->__construct($templatedir, $refDir); } /** - * 设定本类自身实例的类引用和使用本类的类实例(如果在类中使用本模板引擎，后一参数一般为$this) + * 设定本类自身实例的类引用和使用本类的类实例，如果在类中使用本模板引擎，后一参数一般为$this * * @access public * @param object $refObj 实例对象 @@ -1032,7 +1032,7 @@ class TagAttribute { return $this->count + 1; } -}//End Class +} /** * 属性解析器 * function C__TagAttributeParse(); @@ -1158,14 +1158,14 @@ class TagAttributeParse $tmpvalue .= $d; } } - } //for + } //最后一个属性的给值 if ($tmpatt != '') { $this->cAttributes->count++; $this->cAttributes->items[$tmpatt] = trim($tmpvalue); } //print_r($this->cAttributes->items); - } //end func -} //End Class + } +} /** * 私有标签编译,主要用于if标签内的字符串解析 * diff --git a/src/system/dedevote.class.php b/src/system/dedevote.class.php index 25aa99db..6e1f45fa 100755 --- a/src/system/dedevote.class.php +++ b/src/system/dedevote.class.php @@ -237,5 +237,5 @@ class DedeVote $res .= "\r\n"; return $res; } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/diyform.class.php b/src/system/diyform.class.php index 09e4a31e..07576180 100755 --- a/src/system/diyform.class.php +++ b/src/system/diyform.class.php @@ -104,5 +104,5 @@ class diyform } return $fields; } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/libraries/dedehttpdown.class.php b/src/system/libraries/dedehttpdown.class.php index 5ac5d03a..2400b65d 100755 --- a/src/system/libraries/dedehttpdown.class.php +++ b/src/system/libraries/dedehttpdown.class.php @@ -627,5 +627,5 @@ class DedeHttpDown $okurl = preg_replace("/\/{1,}/", "/", $okurl); return $proto.$okurl; } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/libraries/mail.class.php b/src/system/libraries/mail.class.php index c1e76284..7acd7a2d 100755 --- a/src/system/libraries/mail.class.php +++ b/src/system/libraries/mail.class.php @@ -258,5 +258,5 @@ class smtp echo $message; } } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/libraries/oxwindow.class.php b/src/system/libraries/oxwindow.class.php index bf1b1923..a9a5ae12 100755 --- a/src/system/libraries/oxwindow.class.php +++ b/src/system/libraries/oxwindow.class.php @@ -216,7 +216,7 @@ class OxWindow $ctp->Display(); $ctp->Clear(); } -}//End Class +} /** * 显示一个不带表单的普通提示 * diff --git a/src/system/libraries/splitword.class.php b/src/system/libraries/splitword.class.php index 9f714abf..e58b0961 100755 --- a/src/system/libraries/splitword.class.php +++ b/src/system/libraries/splitword.class.php @@ -466,9 +466,9 @@ class SplitWord $this->simpleResult[$s]['t'] = 5; $s++; } - }//2byte symbol - }//end 2byte char - }//end for + } + } + } //处理分词后的结果 $this->_sort_finally_result(); } @@ -782,7 +782,7 @@ class SplitWord } $j++; } - }//end for + } $smarr = $newarr; } /** diff --git a/src/system/memberlogin.class.php b/src/system/memberlogin.class.php index 01adee36..3f76d43d 100755 --- a/src/system/memberlogin.class.php +++ b/src/system/memberlogin.class.php @@ -559,5 +559,5 @@ class MemberLogin } return $result; } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/typelink/typelink.class.php b/src/system/typelink/typelink.class.php index 62acb82f..0e23e4ea 100755 --- a/src/system/typelink/typelink.class.php +++ b/src/system/typelink/typelink.class.php @@ -332,19 +332,19 @@ class TypeLink $likeType .= "\r\n"; } $GLOBALS['autoindex']++; - }//Loop Col + } if ($col > 1) { $i += $col - 1; } if ($col > 1) { $likeType .= "\r\n"; } - }//Loop for $i + } if ($col > 1) { $likeType .= "\r\n"; } $this->dsql->FreeResult(); return $likeType; - }//GetChannel -}//End Class + } +} ?> \ No newline at end of file diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index d77b3d4b..1e111b4e 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/src/system/typelink/typeunit.class.admin.php @@ -405,5 +405,5 @@ tpl; $dh->close(); return (1); } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/typelink/typeunit.class.menu.php b/src/system/typelink/typeunit.class.menu.php index 59250cec..423cd8db 100755 --- a/src/system/typelink/typeunit.class.menu.php +++ b/src/system/typelink/typeunit.class.menu.php @@ -164,5 +164,5 @@ class TypeUnit } } } -}//End Class +} ?> \ No newline at end of file diff --git a/src/system/typelink/typeunit.class.selector.php b/src/system/typelink/typeunit.class.selector.php index 818286e1..7a1c7777 100755 --- a/src/system/typelink/typeunit.class.selector.php +++ b/src/system/typelink/typeunit.class.selector.php @@ -127,5 +127,5 @@ class TypeUnitSelector } } } -}//End Class +} ?> \ No newline at end of file