From 18f37293378516d04e41575d9cc5c5afee4df529 Mon Sep 17 00:00:00 2001
From: tianya
Date: Fri, 25 Sep 2020 09:48:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E7=94=B1=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 4 +
src/dede/makehtml_freelist.php | 1 +
src/dede/makehtml_freelist_action.php | 3 +-
src/dede/makehtml_homepage.php | 7 +-
src/dede/makehtml_map.php | 4 +-
src/dede/makehtml_rss.php | 1 +
src/dede/makehtml_rss_action.php | 4 +-
src/dede/makehtml_spec.php | 4 +-
src/dede/templets/freelist_add.htm | 120 ++++++++++--------
src/dede/templets/makehtml_freelist.htm | 155 +++++++++++++-----------
src/include/arc.freelist.class.php | 7 +-
src/include/arc.specview.class.php | 4 +-
src/include/common.func.php | 2 +-
src/include/dedetag.class.php | 1 +
src/static/css/dede.css | 5 +
src/templets/default/article_spec.htm | 1 -
src/templets/default/list_article.htm | 2 +-
src/templets/default/list_free.htm | 121 +++++++++---------
src/templets/default/list_spec.htm | 152 ++++++++++++-----------
src/templets/system/spec_arclist.htm | 2 +-
20 files changed, 339 insertions(+), 261 deletions(-)
diff --git a/.gitignore b/.gitignore
index 33e74142..17e0e3cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,7 @@ src/data/backupdata/*
src/a/*.html
src/data/mkall_cache_*.php
src/data/payment/cod.php
+src/freelist/
+src/data/rss/*
+src/data/rssmap.html
+src/data/sitemap.html
diff --git a/src/dede/makehtml_freelist.php b/src/dede/makehtml_freelist.php
index 1ecdf7c1..6c276c51 100755
--- a/src/dede/makehtml_freelist.php
+++ b/src/dede/makehtml_freelist.php
@@ -5,6 +5,7 @@
* @version $Id: makehtml_freelist.php 1 9:17 2010年7月19日Z tianya $
* @package DedeCMS.Administrator
* @copyright Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright Copyright (c) 2020, DedeBIZ.COM
* @license http://help.dedecms.com/usersguide/license.html
* @link http://www.dedecms.com
*/
diff --git a/src/dede/makehtml_freelist_action.php b/src/dede/makehtml_freelist_action.php
index 4054234c..31ec7a83 100755
--- a/src/dede/makehtml_freelist_action.php
+++ b/src/dede/makehtml_freelist_action.php
@@ -5,6 +5,7 @@
* @version $Id: makehtml_freelist_action.php 1 9:11 2010年7月19日Z tianya $
* @package DedeCMS.Administrator
* @copyright Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright Copyright (c) 2020, DedeBIZ.COM
* @license http://help.dedecms.com/usersguide/license.html
* @link http://www.dedecms.com
*/
@@ -18,7 +19,7 @@ if(!empty($endid) && $endid>=$startid)
$ci .= " And aid <= $endid ";
}
header("Content-Type: text/html; charset={$cfg_soft_lang}");
-$dsql->SetQuery("Select aid From #@__freelist where $ci");
+$dsql->SetQuery("SELECT aid FROM `#@__freelist` WHERE $ci");
$dsql->Execute();
while($row=$dsql->GetArray())
{
diff --git a/src/dede/makehtml_homepage.php b/src/dede/makehtml_homepage.php
index 3a8a31a7..3e636fb2 100755
--- a/src/dede/makehtml_homepage.php
+++ b/src/dede/makehtml_homepage.php
@@ -5,6 +5,7 @@
* @version $Id: makehtml_homepage.php 2 9:30 2010-11-11 tianya $
* @package DedeCMS.Administrator
* @copyright Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright Copyright (c) 2020, DedeBIZ.COM
* @license http://help.dedecms.com/usersguide/license.html
* @link http://www.dedecms.com
*/
@@ -44,11 +45,13 @@ else if($dopost=="make")
$GLOBALS['_arclistEnv'] = 'index';
$pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet);
$pv->SaveToHtml($homeFile);
- echo "成功更新主页HTML:".$homeFile."
浏览...
";
+ echo "";
+ echo "成功更新主页HTML:".$homeFile."
浏览...
";
} else {
// 动态浏览
if (file_exists($homeFile)) @unlink($homeFile);
- echo "采用动态浏览模式:浏览...
";
+ echo "";
+ echo "
";
}
$iquery = "UPDATE `#@__homepageset` SET showmod='$showmod'";
diff --git a/src/dede/makehtml_map.php b/src/dede/makehtml_map.php
index e10425ea..b22081d4 100755
--- a/src/dede/makehtml_map.php
+++ b/src/dede/makehtml_map.php
@@ -5,6 +5,7 @@
* @version $Id: makehtml_map.php 1 11:17 2010年7月19日Z tianya $
* @package DedeCMS.Administrator
* @copyright Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright Copyright (c) 2020, DedeBIZ.COM
* @license http://help.dedecms.com/usersguide/license.html
* @link http://www.dedecms.com
*/
@@ -35,5 +36,6 @@ $dtp = new DedeTagParse();
$dtp->LoadTemplet($tmpfile);
$dtp->SaveTo($cfg_basedir.$murl);
$dtp->Clear();
-echo "成功更新文件: $murl 浏览...";
+echo "";
+echo "";
exit();
\ No newline at end of file
diff --git a/src/dede/makehtml_rss.php b/src/dede/makehtml_rss.php
index cb9d23ab..c28eee85 100755
--- a/src/dede/makehtml_rss.php
+++ b/src/dede/makehtml_rss.php
@@ -5,6 +5,7 @@
* @version $Id: makehtml_rss.php 1 11:17 2010年7月19日Z tianya $
* @package DedeCMS.Administrator
* @copyright Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright Copyright (c) 2020, DedeBIZ.COM
* @license http://help.dedecms.com/usersguide/license.html
* @link http://www.dedecms.com
*/
diff --git a/src/dede/makehtml_rss_action.php b/src/dede/makehtml_rss_action.php
index dc8268f7..ade08073 100755
--- a/src/dede/makehtml_rss_action.php
+++ b/src/dede/makehtml_rss_action.php
@@ -5,6 +5,7 @@
* @version $Id: makehtml_rss.php 1 11:17 2010年7月19日Z tianya $
* @package DedeCMS.Administrator
* @copyright Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright Copyright (c) 2020, DedeBIZ.COM
* @license http://help.dedecms.com/usersguide/license.html
* @link http://www.dedecms.com
*/
@@ -18,7 +19,8 @@ if(empty($maxrecord)) $maxrecord = 50;
$row = $dsql->GetOne("SELECT id FROM `#@__arctype` WHERE id>'$tid' AND ispart<>2 ORDER BY id ASC LIMIT 0,1;");
if(!is_array($row))
{
- echo "完成所有文件更新!";
+ echo "";
+ echo "完成所有文件更新!
";
} else {
$rv = new RssView($row['id'],$maxrecord);
$rssurl = $rv->MakeRss(0);
diff --git a/src/dede/makehtml_spec.php b/src/dede/makehtml_spec.php
index eba04c99..448b31e2 100755
--- a/src/dede/makehtml_spec.php
+++ b/src/dede/makehtml_spec.php
@@ -5,6 +5,7 @@
* @version $Id: makehtml_spec.php 1 11:17 2010年7月19日Z tianya $
* @package DedeCMS.Administrator
* @copyright Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright Copyright (c) 2020, DedeBIZ.COM
* @license http://help.dedecms.com/usersguide/license.html
* @link http://www.dedecms.com
*/
@@ -17,7 +18,8 @@ if($dopost=="ok")
require_once(DEDEINC."/arc.specview.class.php");
$sp = new SpecView();
$rurl = $sp->MakeHtml(0);
- echo "成功生成所有专题HTML列表!预览";
+ echo "";
+ echo "";
exit();
}
include DedeInclude('templets/makehtml_spec.htm');
\ No newline at end of file
diff --git a/src/dede/templets/freelist_add.htm b/src/dede/templets/freelist_add.htm
index c67813c5..2491a6dd 100755
--- a/src/dede/templets/freelist_add.htm
+++ b/src/dede/templets/freelist_add.htm
@@ -11,44 +11,6 @@
-
@@ -64,11 +26,27 @@
-
[field:textlink/]
+
+
+
-
[[field:typelink/]][field:textlink/]
+
+
+
@@ -83,15 +61,23 @@
-
- [field:imglink/]
- [field:textlink/]
-
- 日期:[field:pubdate function="GetDateMK(@me)"/]
- 点击:[field:click/]
- 好评:[field:scores/]
-
- [field:description/]...
+
+
+
+
+
+
+ 日期:[field:pubdate function="MyDate('Y-m-d', @me)"/] 点击:[field:click/] 好评:[field:scores/]
+
+
", "
"));
+ editor.setValue(editor.getValue().toLowerCase());
+ }
+ function ShowHide(objname) {
+ var obj = document.getElementById(objname);
+ if (obj.style.display == "block" || obj.style.display == "")
+ obj.style.display = "none";
+ else
+ obj.style.display = "block";
+ }
+ function SelectTemplets(fname) {
+ if (document.all) {
+ var posLeft = window.event.clientY - 200;
+ var posTop = window.event.clientX - 300;
+ }
+ else {
+ var posLeft = 100;
+ var posTop = 100;
+ }
+ window.open("./dialog/select_templets.php?&activepath=&f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left=" + posLeft + ", top=" + posTop);
+ }
+ function CheckSubmit() {
+ if (document.form1.title.value == "") {
+ ShowMsg("自由列表标题标题不能为空!");
+ document.form1.title.focus();
+ return false;
+ }
+ return true;
+ }
-
-
diff --git a/src/dede/templets/makehtml_freelist.htm b/src/dede/templets/makehtml_freelist.htm
index 19cdf586..b7007c72 100755
--- a/src/dede/templets/makehtml_freelist.htm
+++ b/src/dede/templets/makehtml_freelist.htm
@@ -1,77 +1,92 @@
-
+
+