From d96aad109d57cb1cdabadda9e687818548610c83 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: Thu, 12 Jan 2023 17:32:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=A6=E5=AE=9A=E6=8C=87=E5=AE=9A=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AE=E4=BC=98=E5=8C=96=EF=BC=8C=E9=9A=90=E8=97=8F=E7=9A=84?=
 =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/archives_do.php               | 10 +++++-----
 src/admin/js/key.js                     |  2 +-
 src/admin/templets/feedback_main.htm    |  8 ++++----
 src/admin/templets/freelist_main.htm    |  2 +-
 src/admin/templets/mychannel_edit.htm   |  2 +-
 src/admin/templets/stepselect_main.htm  |  4 ++--
 src/admin/templets/templets_default.htm |  2 +-
 src/system/common.func.php              |  6 ++++--
 src/system/taglib/arclist.lib.php       | 12 +++++-------
 src/user/templets/content_list.htm      |  2 +-
 src/user/templets/content_sg_list.htm   |  2 +-
 src/user/templets/mypay.htm             |  2 +-
 src/user/templets/operation.htm         |  2 +-
 src/user/templets/pm-main.htm           |  2 +-
 14 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php
index 22da1658..68e31477 100644
--- a/src/admin/archives_do.php
+++ b/src/admin/archives_do.php
@@ -289,7 +289,7 @@ else if ($dopost == 'moveArchives') {
             <td width="90" class="admin-td">文档id：</td>
             <td class="admin-td">
                 <input type="text" name="tmpids" class="admin-input-md" value="<?php echo $qstr;?>"><br>
-                移动到目标栏目必须和选定文档栏目类型一致，否则程序会自动勿略不符合文档
+                移动栏目必须和选定文档栏目类型一致，否则自动过滤不相关文档
             </td>
         </tr>
         <tr>
@@ -301,7 +301,7 @@ else if ($dopost == 'moveArchives') {
         </table>
         </form>
         <?php
-        //AJAX窗体结束
+        //Ajax窗体结束
         } else {
         $totype = preg_replace("#[^0-9]#", '', $totype);
         $typeInfos = $dsql->GetOne("SELECT tp.channeltype,tp.ispart,tp.channeltype,ch.maintable,ch.addtable,ch.issystem FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch on ch.id=tp.channeltype WHERE tp.id='$totype' ");
@@ -588,7 +588,7 @@ else if ($dopost == 'quickEdit') {
     </table>
     </form>
 <?php
-//AJAX窗体结束
+//Ajax窗体结束
 }
 /*-----------------------------
 //保存快速修改文档
@@ -840,7 +840,7 @@ else if ($dopost == 'attsDlg') {
     </table>
     </form>
 <?php
-//AJAX窗体结束
+//Ajax窗体结束
 }
 /*------------------------
 function getCatMap() {  }
@@ -861,6 +861,6 @@ else if ($dopost == 'getCatMap') {
         </div>
     </form>
 <?php
-//AJAX窗体结束
+//Ajax窗体结束
 }
 ?>
\ No newline at end of file
diff --git a/src/admin/js/key.js b/src/admin/js/key.js
index 576c7cab..545e4cf9 100644
--- a/src/admin/js/key.js
+++ b/src/admin/js/key.js
@@ -18,7 +18,7 @@ function noselAll()
 //批量删除搜多关键字
 function delall()
 {
-	DedeConfirm("您确定要删除选定的关键字吗？").then((v)=>{
+	DedeConfirm("您确定要删除选定的关键字吗").then((v)=>{
 		document.form3.dopost.value = 'delall';
 		document.form3.submit();
 	}).catch((e)=>{
diff --git a/src/admin/templets/feedback_main.htm b/src/admin/templets/feedback_main.htm
index 1b8f19b2..8f798a99 100644
--- a/src/admin/templets/feedback_main.htm
+++ b/src/admin/templets/feedback_main.htm
@@ -61,7 +61,7 @@
 					ShowMsg("您没选中任何文档");
 					return
 				};
-				DedeConfirm("您确定要删除这些评论吗？").then((v)=>{
+				DedeConfirm("您确定要删除这些评论吗").then((v)=>{
 					location.href = "feedback_main.php?job=del&fid=" + qstr
 				}).catch((e)=>{
 					console.log(e)
@@ -73,7 +73,7 @@
 					ShowMsg("您没选中任何文档");
 					return;
 				};
-				DedeConfirm("您确定要删除这些评论吗？").then((v)=>{
+				DedeConfirm("您确定要删除这些评论吗").then((v)=>{
 					location.href = "feedback_main.php?job=delall&fid=" + qstr;
 				}).catch((e)=>{
 					console.log(e)
@@ -85,7 +85,7 @@
 					ShowMsg("您没选中任何文档");
 					return;
 				};
-				DedeConfirm("您确定要删除这些评论吗？").then((v)=>{
+				DedeConfirm("您确定要删除这些评论吗").then((v)=>{
 					location.href = "feedback_main.php?job=check&fid=" + qstr;
 				}).catch((e)=>{
 					console.log(e)
@@ -97,7 +97,7 @@
 					ShowMsg("您没选中任何文档");
 					return;
 				}
-				DedeConfirm("您确定要删除这些评论吗？").then((v)=>{
+				DedeConfirm("您确定要删除这些评论吗").then((v)=>{
 					location.href = "feedback_edit.php?job=edit&fid=" + qstr;
 				}).catch((e)=>{
 					console.log(e)
diff --git a/src/admin/templets/freelist_main.htm b/src/admin/templets/freelist_main.htm
index 4a68b1ed..5175ff13 100644
--- a/src/admin/templets/freelist_main.htm
+++ b/src/admin/templets/freelist_main.htm
@@ -43,7 +43,7 @@
 			}
 			//删除
 			function DelNote(nid) {
-				DedeConfirm("您确认要删除这条记录吗？").then((v)=>{
+				DedeConfirm("您确认要删除这条记录吗").then((v)=>{
 					var listArea = $Obj('rslist');
 					totalrow = totalrow - 1;
 					var pagenum = Math.ceil(totalrow / pagesize);
diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm
index af358535..ca4a56a1 100644
--- a/src/admin/templets/mychannel_edit.htm
+++ b/src/admin/templets/mychannel_edit.htm
@@ -300,7 +300,7 @@
 			}
 			//删除
 			function DelNote(gourl) {
-				DedeConfirm("您确认要删除这个字段吗？").then((v)=>{
+				DedeConfirm("您确认要删除这个字段吗").then((v)=>{
 					location.href = gourl;
 				}).catch((e)=>{
 					console.log(e)
diff --git a/src/admin/templets/stepselect_main.htm b/src/admin/templets/stepselect_main.htm
index 99eab8de..a9b79aac 100644
--- a/src/admin/templets/stepselect_main.htm
+++ b/src/admin/templets/stepselect_main.htm
@@ -94,7 +94,7 @@
             });
         }
         function DelType() {
-            DedeConfirm("您确实要删除这个分类吗？").then((v)=>{
+            DedeConfirm("您确实要删除这个分类吗").then((v)=>{
                 var id = GetSelType();
                 if (id == 0) {
                     ShowMsg("必须选择一个类别");
@@ -126,7 +126,7 @@
             }
         }
         function DelSel() {
-            DedeConfirm("您确实要删除这些分类吗？").then((v)=>{
+            DedeConfirm("您确实要删除这些分类吗").then((v)=>{
                 document.form1.submit();
             }).catch((e)=>{
                 console.log(e)
diff --git a/src/admin/templets/templets_default.htm b/src/admin/templets/templets_default.htm
index c5aa6d84..b309ddfc 100644
--- a/src/admin/templets/templets_default.htm
+++ b/src/admin/templets/templets_default.htm
@@ -9,7 +9,7 @@
 		<link rel="stylesheet" href="../static/web/css/admin.css">
 		<script>
 			function DelTpl(filename) {
-				DedeConfirm("您确实要删除这个模板吗？").then((v)=>{
+				DedeConfirm("您确实要删除这个模板吗").then((v)=>{
 					location = 'tpl.php?action=del&acdir=<?php echo $acdir;?>&filename=' +
 						filename;
 				}).catch((e)=>{
diff --git a/src/system/common.func.php b/src/system/common.func.php
index fb7dc807..c819fb6d 100755
--- a/src/system/common.func.php
+++ b/src/system/common.func.php
@@ -545,7 +545,8 @@ function face($mid)
 }
 //标签调用标签[field:id function='GetMyTags(@me,2)'/]2表示输出2个文档
 if (!function_exists('GetMyTags')) {
-    function GetMyTags($aid, $num=3) {
+    function GetMyTags($aid, $num=3)
+    {
         global $dsql,$cfg_cmspath;
         $tags = '';
         $query = "SELECT * FROM `#@__taglist` WHERE aid='$aid' LIMIT $num";
@@ -559,7 +560,8 @@ if (!function_exists('GetMyTags')) {
 }
 /*用户中心调用默认模板<?php pasterTempletDiy('head.htm');?>*/
 if (!function_exists('pasterTempletDiy')) {
-    function pasterTempletDiy($path) {
+    function pasterTempletDiy($path)
+    {
         global $cfg_basedir,$cfg_templets_dir,$cfg_df_style;
         $tmpfile = $cfg_basedir.$cfg_templets_dir.'/'.$cfg_df_style.'/'.$path;
         $dtp = new PartView();
diff --git a/src/system/taglib/arclist.lib.php b/src/system/taglib/arclist.lib.php
index 3e3f613e..44511f40 100755
--- a/src/system/taglib/arclist.lib.php
+++ b/src/system/taglib/arclist.lib.php
@@ -3,8 +3,6 @@ if (!defined('DEDEINC')) exit('dedebiz');
 /**
  * 文档列表调用标记
  *
- * 9:19 2010年7月13日:修正对isweight属性的支持
- *
  * @version        $id:arclist.lib.php 3 9:19 2010年7月13日 tianya $
  * @package        DedeBIZ.Taglib
  * @copyright      Copyright (c) 2022 DedeBIZ.COM
@@ -74,7 +72,7 @@ function lib_arclist(&$ctag, &$refObj)
     } else {
         $flag = $ctag->GetAtt('att');
     }
-    return lib_arclistDone ($refObj, $ctag, $typeid, $ctag->GetAtt('row'), $ctag->GetAtt('col'), $titlelen, $infolen, $ctag->GetAtt('imgwidth'), $ctag->GetAtt('imgheight'), $listtype, $orderby, $ctag->GetAtt('keyword'), $innertext, $envs['aid'], $ctag->GetAtt('idlist'), $channelid, $ctag->GetAtt('limit'), $flag,$ctag->GetAtt('orderway'), $ctag->GetAtt('subday'), $ctag->GetAtt('noflag'), $tagid,$pagesize,$isweight,$ctag->GetAtt('notypeid')
+    return lib_arclistDone ($refObj, $ctag, $typeid, $ctag->GetAtt('row'), $ctag->GetAtt('col'), $titlelen, $infolen, $ctag->GetAtt('imgwidth'), $ctag->GetAtt('imgheight'), $listtype, $orderby, $ctag->GetAtt('keyword'), $innertext, $envs['aid'], $ctag->GetAtt('idlist'), $channelid, $ctag->GetAtt('limit'), $flag,$ctag->GetAtt('orderway'), $ctag->GetAtt('subday'), $ctag->GetAtt('noflag'), $tagid, $pagesize,$isweight, $ctag->GetAtt('notypeid')
     );
 }
 /**
@@ -106,7 +104,7 @@ function lib_arclist(&$ctag, &$refObj)
  * @param     string  $isweight  是否需要对检索出来的文档按照weight排序
  * @return    string
  */
-function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlelen=30, $infolen=160, $imgwidth=120, $imgheight=90, $listtype='all', $orderby='default', $keyword='', $innertext='', $arcid=0, $idlist='', $channelid=0, $limit='', $att='', $order='desc', $subday=0, $noflag='',$tagid='', $pagesize=0, $isweight='N',$notypeid=0)
+function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlelen=30, $infolen=160, $imgwidth=120, $imgheight=90, $listtype='all', $orderby='default', $keyword='', $innertext='', $arcid=0, $idlist='', $channelid=0, $limit='', $att='', $order='desc', $subday=0, $noflag='',$tagid='', $pagesize=0, $isweight='N', $notypeid=0)
 {
     global $dsql, $PubFields, $cfg_keyword_like, $cfg_index_cache, $_arclistEnv, $envs, $cfg_cache_type, $cfg_digg_update;
     $row = AttDef($row, 10);
@@ -227,8 +225,8 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele
             }
         }
         $orwheres[] = 'arc.arcrank > -1';
-        if (!empty($notypeid))
-        {
+        //否定指定栏目
+        if (!empty($notypeid)) {
             $orwheres[] = "and arc.typeid NOT IN (".GetSonIds($notypeid).")";
         }
         //由于这个条件会导致缓存功能失去意义，因此取消
@@ -260,7 +258,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele
         $orwhere = preg_replace("#^ And#is", '', $orwhere);
         $orwhere = preg_replace("#And[ ]{1,}And#is", 'And ', $orwhere);
     }
-    if ($orwhere != '') $orwhere = " WHERE $orwhere ";
+    if ($orwhere != '') $orwhere = " WHERE $orwhere and tp.ishidden != 1 ";
     //获取附加表信息
     $addfield = trim($ctag->GetAtt('addfields'));
     $addfieldsSql = '';
diff --git a/src/user/templets/content_list.htm b/src/user/templets/content_list.htm
index 7defc460..09973ab9 100755
--- a/src/user/templets/content_list.htm
+++ b/src/user/templets/content_list.htm
@@ -17,7 +17,7 @@
 				location = "archives_do.php?dopost=edit&channelid=" + channelid + "&aid=" + aid;
 			}
 			function delArc(aid) {
-				DedeConfirm("您确定要删除这篇文档吗？").then((v)=>{
+				DedeConfirm("您确定要删除这篇文档吗").then((v)=>{
 					location = "archives_do.php?aid=" + aid + "&dopost=delArc";
 				}).catch((e)=>{
 					console.log(e)
diff --git a/src/user/templets/content_sg_list.htm b/src/user/templets/content_sg_list.htm
index a6ea0287..5f8705f5 100755
--- a/src/user/templets/content_sg_list.htm
+++ b/src/user/templets/content_sg_list.htm
@@ -17,7 +17,7 @@
 				location = "archives_do.php?dopost=edit&channelid=" + channelid + "&aid=" + aid;
 			}
 			function delArc(aid) {
-				DedeConfirm("您确定要删除这篇文档吗？").then((v)=>{
+				DedeConfirm("您确定要删除这篇文档吗").then((v)=>{
 					location = "archives_do.php?aid=" + aid + "&dopost=delArc";
 				}).catch((e)=>{
 					console.log(e)
diff --git a/src/user/templets/mypay.htm b/src/user/templets/mypay.htm
index 05d6aa50..078f4742 100755
--- a/src/user/templets/mypay.htm
+++ b/src/user/templets/mypay.htm
@@ -88,7 +88,7 @@
 					ShowMsg("您没选中任何信息");
 					return false;
 				}
-				DedeConfirm("您确定要删除这些消息吗？").then((v)=>{
+				DedeConfirm("您确定要删除这些消息吗").then((v)=>{
 					location = "mypay.php?dopost=del&ids=" + selid;
 				}).catch((e)=>{
 					console.log(e)
diff --git a/src/user/templets/operation.htm b/src/user/templets/operation.htm
index facafc8e..5315711b 100755
--- a/src/user/templets/operation.htm
+++ b/src/user/templets/operation.htm
@@ -82,7 +82,7 @@
 					ShowMsg("您没选中任何信息");
 					return false;
 				}
-				DedeConfirm("您确定要删除这些消息吗？").then((v)=>{
+				DedeConfirm("您确定要删除这些消息吗").then((v)=>{
 					location = "operation.php?dopost=del&ids=" + selid;
 				}).catch((e)=>{
 					console.log(e)
diff --git a/src/user/templets/pm-main.htm b/src/user/templets/pm-main.htm
index 7f50e814..4ba09b93 100755
--- a/src/user/templets/pm-main.htm
+++ b/src/user/templets/pm-main.htm
@@ -51,7 +51,7 @@
 					ShowMsg("您没选中任何信息");
 					return false;
 				}
-				DedeConfirm("您确定要删除这些消息吗？").then((v)=>{
+				DedeConfirm("您确定要删除这些消息吗").then((v)=>{
 					$.get("pm.php?dopost=remove&ids=" + selid + "&folder=" + myfolder,function (data) {
 						let result = JSON.parse(data);
 						if (result.code === 200) {