From 2959ebb82d574f1387c0ca3c721410b342944814 Mon Sep 17 00:00:00 2001
From: tianya <tianya@benshar.com>
Date: Thu, 14 Apr 2022 19:12:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                |  1 +
 src/admin/ad_add.php                      |  2 +-
 src/admin/js/main.js                      |  6 +++++-
 src/admin/sys_data.php                    |  6 +++---
 src/admin/templets/sys_data.htm           | 24 +++++------------------
 src/system/helpers/channelunit.helper.php | 14 +++++++------
 6 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 068a841d..7489c6d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@ src/static/js/*.js
 src/apps/special/*.html
 src/static/flink/*.png
 src/static/rss/*.xml
+src/a/baidunews.xml
diff --git a/src/admin/ad_add.php b/src/admin/ad_add.php
index 112ea0a7..6caddad1 100644
--- a/src/admin/ad_add.php
+++ b/src/admin/ad_add.php
@@ -16,7 +16,7 @@ if ($dopost == "save") {
     CheckCSRF();
     //timeset tagname typeid normbody expbody
     $tagname = trim($tagname);
-    $row = $dsql->GetOne("SELECT typeid FROM #@__myad WHERE typeid='$typeid' AND tagname LIKE '$tagname'");
+    $row = $dsql->GetOne("SELECT typeid FROM `#@__myad` WHERE typeid='$typeid' AND tagname LIKE '$tagname'");
     if (is_array($row)) {
         ShowMsg("在相同栏目下已经存在同名的标记", "-1");
         exit();
diff --git a/src/admin/js/main.js b/src/admin/js/main.js
index f4b8d605..eee1c0e0 100644
--- a/src/admin/js/main.js
+++ b/src/admin/js/main.js
@@ -531,6 +531,7 @@ function guid() {
 // https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax
 function ShowMsg(content, ...args) {
 	title = "系统提示";
+	size = "";
 	if (typeof content == "undefined") content = "";
 	modalID = guid();
 	var footer = `<button type="button" class="btn btn-primary" onClick="CloseModal(\'GKModal${modalID}\')">Ok</button>`;
@@ -543,6 +544,9 @@ function ShowMsg(content, ...args) {
 		if (typeof args[0].footer !== 'undefined' && args[0].footer != "") {
 			footer = args[0].footer;
 		}
+		if (typeof args[0].size !== 'undefined' && args[0].size != "") {
+			size = args[0].size;
+		}
 		if (typeof args[0].noClose !== 'undefined' && args[0].noClose == true) {
 			noClose = true;
 		}
@@ -550,7 +554,7 @@ function ShowMsg(content, ...args) {
 	footer = footer.replaceAll("~modalID~", modalID);
 	content = content.replaceAll("~modalID~", modalID);
 	var modal = `<div id="GKModal${modalID}" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="GKModalLabel${modalID}">
-<div class="modal-dialog" role="document">
+<div class="modal-dialog ${size}" role="document">
 <div class="modal-content"><div class="modal-header">
 <h5 class="modal-title" id="GKModalLabel${modalID}">${title}</h5>`;
 	if (!noClose) {
diff --git a/src/admin/sys_data.php b/src/admin/sys_data.php
index 5a9b7737..94236f0f 100644
--- a/src/admin/sys_data.php
+++ b/src/admin/sys_data.php
@@ -19,7 +19,7 @@ if ($cfg_dbtype == 'sqlite') {
 
 if ($dopost == "viewinfo") //查看表结构
 {
-    echo "[<a href='javascript:;' onclick='javascript:HideObj(\"_mydatainfo\")'>关闭</a>]\r\n<xmp>";
+    echo "<xmp>";
     if (empty($tablename)) {
         echo "没有指定表名";
     } else {
@@ -33,7 +33,7 @@ if ($dopost == "viewinfo") //查看表结构
     exit();
 } else if ($dopost == "opimize") //优化表
 {
-    echo "[<a href='javascript:;' onclick='javascript:HideObj(\"_mydatainfo\")'>关闭</a>]\r\n<xmp>";
+    echo "<xmp>";
     if (empty($tablename)) {
         echo "没有指定表名";
     } else {
@@ -48,7 +48,7 @@ if ($dopost == "viewinfo") //查看表结构
     exit();
 } else if ($dopost == "repair") //修复表
 {
-    echo "[<a href='javascript:;' onclick='javascript:HideObj(\"_mydatainfo\")'>关闭</a>]\r\n<xmp>";
+    echo "<xmp>";
     if (empty($tablename)) {
         echo "没有指定表名";
     } else {
diff --git a/src/admin/templets/sys_data.htm b/src/admin/templets/sys_data.htm
index 10f4f59a..1abaf46c 100644
--- a/src/admin/templets/sys_data.htm
+++ b/src/admin/templets/sys_data.htm
@@ -6,39 +6,25 @@
   <link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
   <link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
   <link rel="stylesheet" href="../static/web/css/admin.css">
+  <script src="../static/web/js/jquery.min.js"></script>
+  <script src="../static/web/js/bootstrap.bundle.min.js"></script>
+  <script src="js/main.js"></script>
   <script language="javascript" src="../static/web/js/webajax.js"></script>
   <script language="javascript">
-    var newobj;
     var posLeft = 200;
     var posTop = 150;
     function LoadUrl(surl) {
-      newobj = document.getElementById('_mydatainfo');
-      if (!newobj) {
-        newobj = document.createElement("DIV");
-        newobj.id = '_mydatainfo';
-        newobj.style.position = 'absolute';
-        newobj.className = "dlg";
-        newobj.style.top = posTop;
-        newobj.style.left = posLeft;
-        document.body.appendChild(newobj);
-      } else {
-        newobj.style.display = "block";
-      }
       fetch("sys_data.php?" + surl).then(resp=>{
 				if (resp.ok) {
 					return resp.text()
 				}
 				throw new Error('x');
 			}).then((d)=>{
-				newobj.innerHTML = d;
+        ShowMsg(d,{size:"modal-lg"});
 			}).catch((error) => {
-				newobj.innerHTML = errMsg;
+				ShowMsg("操作失败");
 			});
     }
-    function HideObj(objname) {
-      var obj = document.getElementById(objname);
-      obj.style.display = "none";
-    }
     //获得选中文件的数据表
     function getCheckboxItem() {
       var myform = document.form1;
diff --git a/src/system/helpers/channelunit.helper.php b/src/system/helpers/channelunit.helper.php
index eb2f9191..9094ad6b 100755
--- a/src/system/helpers/channelunit.helper.php
+++ b/src/system/helpers/channelunit.helper.php
@@ -209,14 +209,16 @@ if (!function_exists('GetTypeUrl')) {
         //伪静态栏目，Nginx伪静态规则参考：
         //rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;
         //rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;
-        if ($cfg_rewrite == 'Y') {
-            //目录版return "/article/".$aid."";
-            //网页版
-            return $GLOBALS['cfg_cmspath']."/list-".$typeid."";
-        }
+
         if($isdefault==-1) {
             //动态
-            $reurl = $GLOBALS['cfg_phpurl']."/list.php?tid=".$typeid;
+            if ($cfg_rewrite == 'Y') {
+                //目录版return "/article/".$aid."";
+                //网页版
+                return $GLOBALS['cfg_cmspath']."/list-".$typeid."";
+            } else {
+                $reurl = $GLOBALS['cfg_phpurl']."/list.php?tid=".$typeid;
+            }
         } else if ($ispart == 2) {
             //跳转网址
             $reurl = $typedir;