更新版本号，移除生成js功能

src/admin/inc/inc_action_info.php

@@ -306,12 +306,6 @@ $actionSearch[7] = array(
             'linkurl' => 'makehtml_rss.php'
         ),
         6  =>  array(
-            'title' => '更新脚本',
-            'description' => '可以获取某个栏目的脚本连接',
-            'purview' => 'sys_MakeHtml',
-            'linkurl' => 'makehtml_js.php'
-        ),
-        7  =>  array(
             'title' => '更新缓存',
             'description' => '更新栏目缓存、更新枚举缓存、清理arclist调用缓存、清理过期会员访问历史、删除过期短信 ',
             'purview' => 'sys_ArcBatch',

src/admin/inc/inc_menu.php

@@ -108,7 +108,6 @@ $adminMenu1
     <m:item name='更新标签' link='makehtml_taglist.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新专题' link='makehtml_spec.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新订阅' link='makehtml_rss.php' rank='sys_MakeHtml' target='main' />
-    <m:item name='更新脚本' link='makehtml_js.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
 </m:top>
 <m:top item='6_' name='会员管理' display='block' rank='member_List,member_Type'>

src/admin/inc/inc_menu_map.php

@@ -70,7 +70,6 @@ $menusMain = "<m:top mapitem='1' item='1_' name='常用操作' display='block'>
     <m:item name='更新标签' link='makehtml_taglist.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新专题' link='makehtml_spec.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新订阅' link='makehtml_rss.php' rank='sys_MakeHtml' target='main' />
-    <m:item name='更新脚本' link='makehtml_js.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
 </m:top>
 <m:top mapitem='5' item='6_' name='会员管理' display='block' rank='member_List,member_Type'>

src/admin/makehtml_js.php

@@ -1,13 +0,0 @@
-<?php
-/**
- * 生成js
- *
- * @version        $Id: makehtml_js.php 1 11:03 2010年7月19日Z tianya $
- * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2022, DedeBIZ.COM
- * @license        https://www.dedebiz.com/license
- * @link           https://www.dedebiz.com
- */
-require_once(dirname(__FILE__)."/config.php");
-require_once(DEDEINC."/typelink/typelink.class.php");
-include DedeInclude('templets/makehtml_js.htm');

src/admin/makehtml_js_action.php

@@ -1,41 +0,0 @@
-<?php
-/**
- * 生成js操作
- *
- * @version        $Id: makehtml_js_action.php 1 11:04 2010年7月19日Z tianya $
- * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2022, DedeBIZ.COM
- * @license        https://www.dedebiz.com/license
- * @link           https://www.dedebiz.com
- */
-require_once(dirname(__FILE__)."/config.php");
-CheckPurview('sys_MakeHtml');
-require_once(DEDEINC."/archive/partview.class.php");
-if (empty($typeid)) $typeid = 0;
-if (empty($templet)) $templet = "plus/js.htm";
-if (empty($uptype)) $uptype = "all";
-if ($uptype == "all") {
-    $row = $dsql->GetOne("SELECT id FROM `#@__arctype` WHERE id>'$typeid' AND ispart<>2 ORDER BY id ASC LIMIT 0,1;");
-    if (!is_array($row)) {
-        echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/web/css/bootstrap.min.css\"><style>.modal {position: static;}</style>";
-        echo "<div class=\"alert alert-success\" role=\"alert\">完成所有文件更新</div>";
-        exit();
-    } else {
-        $pv = new PartView($row['id']);
-        $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet);
-        $pv->SaveToHtml($cfg_basedir.$cfg_cmspath."/static/js/".$row['id'].".js", 0);
-        $typeid = $row['id'];;
-        ShowMsg("成功更新".$cfg_cmspath."/static/js/".$row['id'].".js，继续执行任务", "makehtml_js_action.php?typeid=$typeid", 0, 100);
-        exit();
-    }
-} else {
-    $pv = new PartView($typeid);
-    $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet);
-    $pv->SaveToHtml($cfg_basedir.$cfg_cmspath."/static/js/".$typeid.".js", 0);
-    echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/web/css/bootstrap.min.css\"><style>.modal {position: static;}</style>";
-    echo "<div class=\"alert alert-success\" role=\"alert\">成功更新".$cfg_cmspath."/static/js/".$typeid.".js";
-    echo "预览：</div>";
-    echo "<hr>";
-    echo "<script src='".$cfg_cmspath."/static/js/".$typeid.".js'></script>";
-    exit();
-}

src/admin/templets/catalog_main.htm

@@ -171,8 +171,6 @@
 					<span style="float:right;padding-right:10px" class="py-3">
 						<a href="catalog_add.php?listtype=all" class="btn btn-success btn-sm">增加顶级栏目</a>
 						<a href="catalog_add.php?dopost=quick" class="btn btn-success btn-sm">批量增加栏目</a>
-						<a href="catalog_do.php?dopost=upcatcache" class="btn btn-success btn-sm">更新栏目缓存</a>
-						<a href="makehtml_list.php" class="btn btn-success btn-sm">更新栏目</a></a>
 					</span>
 				</td>
 			</tr>
@@ -205,10 +203,9 @@
 			</form>
 			<tr>
 				<td align="right" class="py-3" style="padding-right:10px;background:#f8f8f8;border-top:1px solid #dee2e6">
-					<button type="button" name="sb1" class="btn btn-success btn-sm" onClick="document.form1.submit();">更新排序</button>
-					<button type="button" name="sb4" class="btn btn-success btn-sm" onClick="location='makehtml_js.php';">更新脚本</button>
 					<button type="button" name="sb2" class="btn btn-success btn-sm" onClick="location='makehtml_list.php';">更新栏目</button>
 					<button type="button" name="sb3" class="btn btn-success btn-sm" onClick="location='makehtml_archives.php';">更新文档</button>
+					<button type="button" name="sb1" class="btn btn-success btn-sm" onClick="document.form1.submit();">更新排序</button>
 				</td>
 			</tr>
 		</table>

src/admin/templets/makehtml_js.htm

@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="<?php echo $cfg_soft_lang; ?>">
-		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-		<title>更新脚本</title>
-		<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="js/main.js"></script>
-		<script>
-			function SelectTemplets(fname) {
-				var pos = GetWinPos(800, 600);
-				window.open("./dialog/select_templets.php?&activepath=<?php echo urlencode($cfg_templets_dir.'/plus')?>&f=" +
-					fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left +", top=" + pos.top);
-			}
-		</script>
-	</head>
-	<body>
-		<table width="98%" cellpadding="3" cellspacing="1" align="center" class="table maintable mt-3 mb-3">
-			<form name="form1" action="makehtml_js_action.php" method="get" target='stafrm'>
-				<tr>
-					<td height="26" colspan="2" background="../static/web/img/tbg.gif">
-						<table width="98%" cellpadding="0" cellspacing="0" class="table table-borderless">
-							<tr>
-								<td width="30%" style="padding-left:10px">更新脚本</td>
-								<td width="70%" align="right"><a href="catalog_main.php" class="btn btn-success btn-sm">栏目管理</a></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-				<tr>
-					<td width="260" height="26">选择栏目：</td>
-					<td height="26">
-						<?php
-						if(empty($cid)) $cid="0";
-						$tl = new TypeLink($cid);
-						$typeOptions = $tl->GetOptionArray($cid,$admin_catalogs,0,1);
-						echo "<select name='typeid' style='width:260px'>";
-						if($cid=="0") echo "<option value='0' selected>所有栏目</option>";
-						echo $typeOptions;
-						echo "</select>";
-						?>
-					</td>
-				</tr>
-				<tr>
-					<td height="26">JS文件：</td>
-					<td height="26">
-						<span><?php echo "&lt;script src='".$cfg_cmspath."/static/js/".$cid.".js'&gt;&lt;/script&gt;"; ?></span>
-					</td>
-				</tr>
-				<tr>
-					<td height="26">模板文件：</td>
-					<td height="26"><input name="templet" type="text" id="templet" value="plus/js.htm" style="width:260px">
-						<button type="button" class="btn btn-success btn-sm" name="set4" onClick="SelectTemplets('form1.templet');">浏览</button>
-					</td>
-				</tr>
-				<tr>
-					<td height="26">更新选项：</td>
-					<td height="26">
-						<label><input type="radio" name="uptype" value="all" class="np"> 更新所有栏目 </label>
-						<label><input name="uptype" type="radio" value="onlyme" class="np" checked> 仅当前文件</label>
-					</td>
-				</tr>
-				<tr>
-					<td height="26" bgcolor="#F8FCF1" colspan="2" align="center">
-						<button name="b112" type="button" class="btn btn-success btn-sm" onClick="document.form1.submit();">开始更新</button>
-					</td>
-				</tr>
-			</form>
-			<tr>
-				<td height="26" colspan="2">
-					<table width="100%" class="table table-borderless">
-						<tr>
-							<td width="70%">结果：</td>
-							<td width="30%" align="right">
-								<script>
-									function ResizeDiv(obj, ty) {
-										if (ty == "+") document.all[obj].style.pixelHeight += 50;
-										else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
-									}
-								</script>
-								<a href="javascript:;" onClick="ResizeDiv('mdv','+');" class="btn btn-success btn-sm">增大</a>
-								<a href="javascript:;" onClick="ResizeDiv('mdv','-');" class="btn btn-success btn-sm">缩小</a>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2" id="mtd">
-					<div id="mdv" style="width:100%;height:360px">
-						<iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe>
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>

src/install/index.php

@@ -15,7 +15,7 @@ if(file_exists(INSLOCKFILE))
 }
 $verMsg = 'V6';
 $dfDbname = 'DedeBIZ';
-$cfg_version_detail = '6.1.9beta'; //详细版本号
+$cfg_version_detail = '6.1.9'; //详细版本号
 $errmsg = '';
 if (version_compare(PHP_VERSION, '8.0.0', '>=') && function_exists("mysqli_report")) {
     mysqli_report(MYSQLI_REPORT_OFF);

src/system/common.inc.php

@@ -185,7 +185,7 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft';
 $cfg_other_medias = $cfg_medias_dir.'/media';
 //软件摘要信息，请不要删除，否则系统无法正确接收系统漏洞或升级信息
 $cfg_version = 'V6';
-$cfg_version_detail = '6.1.9beta'; //详细版本号
+$cfg_version_detail = '6.1.9'; //详细版本号
 $cfg_soft_lang = 'utf-8';
 $cfg_soft_public = 'base';
 $cfg_softname = '织梦内容管理系统';