diff --git a/src/admin/makehtml_list_action.php b/src/admin/makehtml_list_action.php index 43679be9..65548176 100644 --- a/src/admin/makehtml_list_action.php +++ b/src/admin/makehtml_list_action.php @@ -10,10 +10,11 @@ */ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_MakeHtml'); -require_once(DEDEDATA."/cache/inc_catalog_base.inc"); require_once(DEDEINC."/channelunit.func.php"); if (!isset($upnext)) $upnext = 1; if (empty($gotype)) $gotype = ''; +if (empty($gotype)) UpDateCatCache(); +require_once(DEDEDATA."/cache/inc_catalog_base.inc"); if (empty($pageno)) $pageno = 0; if (empty($mkpage)) $mkpage = 1; if (empty($typeid)) $typeid = 0; @@ -34,6 +35,7 @@ if ($gotype == '' || $gotype == 'mkallct') { $idArray[] = $typeid; } } + //一键更新带缓存的情况 else if ($gotype == 'mkall') { $uppage = 1; @@ -41,6 +43,10 @@ else if ($gotype == 'mkall') { $idArray = array(); if (file_exists($mkcachefile)) require_once($mkcachefile); } +if (!$idArray) { + ShowMsg("尚未添加栏目,请先添加栏目再进行更新", "javascript:;"); + exit; +} //当前更新栏目id $totalpage = count($idArray); if (isset($idArray[$pageno])) { diff --git a/src/install/sql-dftables.txt b/src/install/sql-dftables.txt index 9200621f..0e441a13 100755 --- a/src/install/sql-dftables.txt +++ b/src/install/sql-dftables.txt @@ -271,6 +271,8 @@ CREATE TABLE `#@__arctype` ( `crossid` text, `content` text, `smalltypes` text, + `apienabled` tinyint unsigned DEFAULT '0', + `apikey` varchar(64) DEFAULT NULL, PRIMARY KEY (`id`), KEY `reid` (`reid`,`isdefault`,`channeltype`,`ispart`,`corank`,`topid`,`ishidden`), KEY `sortrank` (`sortrank`) diff --git a/src/theme/dedebiz/article_article.htm b/src/theme/dedebiz/article_article.htm index 48a3678a..90825f22 100644 --- a/src/theme/dedebiz/article_article.htm +++ b/src/theme/dedebiz/article_article.htm @@ -67,17 +67,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/article_default.htm b/src/theme/dedebiz/article_default.htm index 24563ce3..9c9a48c7 100644 --- a/src/theme/dedebiz/article_default.htm +++ b/src/theme/dedebiz/article_default.htm @@ -80,17 +80,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/article_default_sg.htm b/src/theme/dedebiz/article_default_sg.htm index 38f8ae26..09c4df52 100644 --- a/src/theme/dedebiz/article_default_sg.htm +++ b/src/theme/dedebiz/article_default_sg.htm @@ -81,17 +81,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/article_image.htm b/src/theme/dedebiz/article_image.htm index c91f616d..756c440d 100644 --- a/src/theme/dedebiz/article_image.htm +++ b/src/theme/dedebiz/article_image.htm @@ -95,17 +95,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/article_infos.htm b/src/theme/dedebiz/article_infos.htm index e40e9636..230ad875 100644 --- a/src/theme/dedebiz/article_infos.htm +++ b/src/theme/dedebiz/article_infos.htm @@ -74,17 +74,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/article_soft.htm b/src/theme/dedebiz/article_soft.htm index c3a54e6f..fdc47c82 100644 --- a/src/theme/dedebiz/article_soft.htm +++ b/src/theme/dedebiz/article_soft.htm @@ -82,17 +82,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/article_spec.htm b/src/theme/dedebiz/article_spec.htm index 2b2891f7..eda122b2 100644 --- a/src/theme/dedebiz/article_spec.htm +++ b/src/theme/dedebiz/article_spec.htm @@ -47,17 +47,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/index_article.htm b/src/theme/dedebiz/index_article.htm index 05d56396..ba3d7c0c 100644 --- a/src/theme/dedebiz/index_article.htm +++ b/src/theme/dedebiz/index_article.htm @@ -43,17 +43,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/index_default.htm b/src/theme/dedebiz/index_default.htm index 05d56396..ba3d7c0c 100644 --- a/src/theme/dedebiz/index_default.htm +++ b/src/theme/dedebiz/index_default.htm @@ -43,17 +43,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/index_default_sg.htm b/src/theme/dedebiz/index_default_sg.htm index 05d56396..ba3d7c0c 100644 --- a/src/theme/dedebiz/index_default_sg.htm +++ b/src/theme/dedebiz/index_default_sg.htm @@ -43,17 +43,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/index_infos.htm b/src/theme/dedebiz/index_infos.htm index 87a7ac2c..63c15187 100644 --- a/src/theme/dedebiz/index_infos.htm +++ b/src/theme/dedebiz/index_infos.htm @@ -43,17 +43,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/list_article.htm b/src/theme/dedebiz/list_article.htm index 5ea7174e..a5ac6d87 100644 --- a/src/theme/dedebiz/list_article.htm +++ b/src/theme/dedebiz/list_article.htm @@ -47,17 +47,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/list_default.htm b/src/theme/dedebiz/list_default.htm index 5ea7174e..a5ac6d87 100644 --- a/src/theme/dedebiz/list_default.htm +++ b/src/theme/dedebiz/list_default.htm @@ -47,17 +47,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/list_default_sg.htm b/src/theme/dedebiz/list_default_sg.htm index 2171c7fb..3b016c0a 100644 --- a/src/theme/dedebiz/list_default_sg.htm +++ b/src/theme/dedebiz/list_default_sg.htm @@ -47,17 +47,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/list_free.htm b/src/theme/dedebiz/list_free.htm index fb259f40..4ccf4638 100644 --- a/src/theme/dedebiz/list_free.htm +++ b/src/theme/dedebiz/list_free.htm @@ -38,17 +38,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/list_image.htm b/src/theme/dedebiz/list_image.htm index 0bab0d3f..fa7be9f4 100644 --- a/src/theme/dedebiz/list_image.htm +++ b/src/theme/dedebiz/list_image.htm @@ -48,17 +48,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/list_infos.htm b/src/theme/dedebiz/list_infos.htm index 97826758..8c759300 100644 --- a/src/theme/dedebiz/list_infos.htm +++ b/src/theme/dedebiz/list_infos.htm @@ -58,17 +58,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/list_spec.htm b/src/theme/dedebiz/list_spec.htm index 8d7ed382..7a844a6e 100644 --- a/src/theme/dedebiz/list_spec.htm +++ b/src/theme/dedebiz/list_spec.htm @@ -47,17 +47,7 @@
-
-
- -
-
+
{dede:include comment='搜索' filename='widget_search.htm'/}
{dede:include comment='推荐栏目' filename='widget_menu.htm'/}
{dede:include comment='热门文档' filename='widget_hot.htm'/}
diff --git a/src/theme/dedebiz/search.htm b/src/theme/dedebiz/search.htm index 6e55bfc8..2fc4ede5 100644 --- a/src/theme/dedebiz/search.htm +++ b/src/theme/dedebiz/search.htm @@ -49,15 +49,7 @@
-
- -
+
{dede:include comment='搜索' filename='widget_search.htm'/}
diff --git a/src/theme/dedebiz/widget_search.htm b/src/theme/dedebiz/widget_search.htm new file mode 100644 index 00000000..a198de9b --- /dev/null +++ b/src/theme/dedebiz/widget_search.htm @@ -0,0 +1,9 @@ +
+ +
\ No newline at end of file