diff --git a/src/admin/makehtml_taglist_action.php b/src/admin/makehtml_taglist_action.php index 80069db7..bac549ea 100644 --- a/src/admin/makehtml_taglist_action.php +++ b/src/admin/makehtml_taglist_action.php @@ -13,10 +13,13 @@ CheckPurview('sys_MakeHtml'); require_once(DEDEINC."/archive/taglist.class.php"); if (empty($pageno)) $pageno = 0; +if (empty($mktime)) $mktime = time(); if (empty($mkpage)) $mkpage = 1; if (empty($upall)) $upall = 0; //是否更新全部 0为更新单个 1为更新全部 if (empty($ctagid)) $ctagid = 0; //当前处理的tagid if (empty($maxpagesize)) $maxpagesize = 50; +$startid = isset($startid) ? intval($startid) : 0; +$endid = isset($endid) ? intval($endid) : 0; $tagid = isset($tagid) ? intval($tagid) : 0; $tagsdir = str_replace("{cmspath}", $cfg_cmspath, $cfg_tags_dir); // 生成 @@ -27,10 +30,12 @@ if ($tagid > 0) { $upall = 1; //更新全部模式 } $allfinish = false; //是否全部完成 +$gwhere = ($startid == 0 ? "WHERE 1=1" : "WHERE id>=$startid"); +if ($endid > $startid && $startid > 0) $gwhere .= " AND id <= $endid "; // 判断生成模式 if ($upall == 1 && $ctagid == 0) { - $rr = $dsql->GetOne("SELECT * FROM `#@__tagindex` WHERE mktime <> uptime OR mktime = 0 LIMIT 1"); - if (!empty($rr) && count($rr) > 0) { + $rr = $dsql->GetOne("SELECT * FROM `#@__tagindex` $gwhere AND mktime <> {$mktime} LIMIT 1"); + if (isset($rr['id']) && $rr['id'] > 0) { $ctagid = $rr['id']; } else { $allfinish = true; @@ -83,20 +88,19 @@ if (is_array($tag) && count($tag) > 0) { if ($finishType) { //完成了一个跳到下一个 if ($upall == 1) { - $now = time(); - $query = "UPDATE `#@__tagindex` SET uptime={$now} WHERE id='$ctagid' "; - $dsql->ExecuteNoneQuery($query); - $query = "UPDATE `#@__tagindex` SET mktime=uptime WHERE id='$ctagid' "; + $query = "UPDATE `#@__tagindex` SET mktime={$mktime} WHERE id='$ctagid' "; $dsql->ExecuteNoneQuery($query); $ctagid = 0; $nextpage = 0; } - $gourl = "makehtml_taglist_action.php?maxpagesize=$maxpagesize&tagid=$tagid&pageno=$nextpage&upall=$upall&ctagid=$ctagid"; + $gourl = "makehtml_taglist_action.php?maxpagesize=$maxpagesize&tagid=$tagid&pageno=$nextpage&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime"; + var_dump_cli($gourl); ShowMsg("成功生成TAG:[".$tag['tag']."],继续进行操作", $gourl, 0, 100); exit(); } else { //继续当前这个 - $gourl = "makehtml_taglist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&tagid=$tagid&pageno=$pageno&upall=$upall&ctagid=$ctagid"; + $gourl = "makehtml_taglist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&tagid=$tagid&pageno=$pageno&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime"; + var_dump_cli($gourl); ShowMsg("成功生成TAG:[".$tag['tag']."],继续进行操作", $gourl, 0, 100); exit(); } diff --git a/src/admin/templets/makehtml_taglist.htm b/src/admin/templets/makehtml_taglist.htm index 3f883e07..a4eb7779 100644 --- a/src/admin/templets/makehtml_taglist.htm +++ b/src/admin/templets/makehtml_taglist.htm @@ -10,29 +10,9 @@ @@ -55,7 +35,7 @@ $row = $dsql->GetOne("Select tag From `#@__tagindex` where id = '$tagid' "); ?> - 输入标签: + 输入标签: 重新选择 @@ -64,24 +44,26 @@ } else { ?> - 输入标签: - - - + 起始ID: + (空或0表示从头开始) + + + 结束ID: + (空或0表示直到结束ID) - 生成位置: + 生成位置: 系统设置-其他选项中“TAGS生成目录”项进行调整 - 每次最大创建页数: + 每次最大创建页数: 个文件 - 标签说明: + 标签说明: 生成静态文件后,访问动态文件则直接跳转到静态文件,如果需要动态访问,删除对应文件即可
Tag首页模板文件://tag.htm
@@ -90,7 +72,7 @@ - + diff --git a/src/admin/templets/makeremote_all.htm b/src/admin/templets/makeremote_all.htm deleted file mode 100644 index 26af4824..00000000 --- a/src/admin/templets/makeremote_all.htm +++ /dev/null @@ -1,106 +0,0 @@ - - - - -远程服务器同步 - - - - - - - - - - - - - - - - - - - - - - $value) - { - $bgcolor = ($key % 2 == 0)? '#E6F3CD' : '#ffffff'; - ?> - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
远程服务器同步向导: [更新同步目录]
-
-  选择 - 项目(站点根目录)项目说明选择服务器状态
[系统]' : '' ; ?>
功能说明:本功能主要用于本地服务器文件同远程服务器进行同步,这里我们有几个是系统文件夹(Html生成、文件上传、专题)是必须要同远程服务器同步的,当然也有可选文件夹,用户可以在系统根目录\data\config.file.inc.php文件中进行修改(修改方法已在文件中说明)
-   - -
- - - - -
进行状态: - - 增大 - 缩小 -
-
-
- -
-
- - \ No newline at end of file