README.md

@@ -77,7 +77,7 @@ Sockets：支持接入DedeBIZ商业组件模块
 
 2.上传程序目录中的`/src`到网站根目录；
 
-3.运行`http://www.yourname.com/install/index.php`(yourname表示你的域名),按照安装提速说明进行程序安装；
+3.运行`http://www.yourname.com/install/index.php`(yourname表示您的域名),按照安装提速说明进行程序安装；
 
 详细安装步骤可以查看[帮助文档](https://www.dedebiz.com/help)
 

dedebiz

@@ -5,11 +5,11 @@
  *
  * @version        2020年12月11日 tianya $
  * @package        DedeBIZ.Command
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-// 切换工作目录到./src
+//切换工作目录到./src
 $workDir = dirname(__FILE__) . "/src";
 chdir($workDir);
 
@@ -32,7 +32,7 @@ WEBSITE:
 	https://www.dedebiz.com/help/
 ";
 
-// 将选项转化为SQL IN参数
+//将选项转化为SQL IN参数
 function Option2SQLin($str = "")
 {
 	$str = preg_replace("#[^0-9-,]#", "", $str);
@@ -72,8 +72,8 @@ function RandEncode($length=26)
 }
 
 if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
-	// PHP5.4以下不支持内建服务器
-	// 用于开发调试
+	//PHP5.4以下不支持内建服务器
+	//用于开发调试
 	if (phpversion() < "5.4") {
 		die("DedeBIZ:command web server not support\n\n");
 	}
@@ -89,10 +89,10 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 	require_once($workDir . "/include/common.inc.php");
 	require_once(DEDEINC . "/cli.class.php");
 
-	// 一个命令行的生成工具
+	//一个命令行的生成工具
 	if (count($argv) > 2 && ($argv[2] == "arc" || $argv[2] == "a")) {
-		// 生成文档
-		// make arc typeid=1
+		//生成文档
+		//make arc typeid=1
 		$t1 = ExecTime();
 		$addsql = "1=1";
 		$typeid = Option2SQLin(DedeCli::getOption("typeid"));
@@ -120,7 +120,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 		DedeCli::write($queryTime);
 		exit;
 	} else if (count($argv) > 2 && ($argv[2] == "list" || $argv[2] == "l")) {
-		// 生成栏目
+		//生成栏目
 		$addsql = "1=1";
 		$typeid = Option2SQLin(DedeCli::getOption("typeid"));
 		if (!empty($typeid)) {
@@ -140,7 +140,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 		}
 		exit;
 	} else if (count($argv) > 2 && ($argv[2] == "index" || $argv[2] == "i")) {
-		// 生成首页
+		//生成首页
 		$position = DedeCli::getOption("position");
 		if (empty($position)) {
 			$position = "../index.html";
@@ -162,7 +162,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
         $pv->SaveToHtml($homeFile);
 		DedeCli::write("Make index html successfull");
 	} else if (count($argv) > 2 && ($argv[2] == "auto" || $argv[2] == "o")) {
-		// 自动生成
+		//自动生成
 		function OptimizeData($dsql)
 		{
 			global $cfg_dbprefix;
@@ -184,7 +184,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 			exit;
 		}
 
-		// 1.生成首页
+		//1.生成首页
         $pv = new PartView();
         $row = $pv->dsql->GetOne("SELECT * FROM `#@__homepageset` ");
         $templet = str_replace("{style}", $cfg_df_style, $row['templet']);
@@ -199,7 +199,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
             if (file_exists($homeFile)) @unlink($homeFile);
 		}
 		DedeCli::write("Make index html successfull");
-		// 2.生成栏目
+		//2.生成栏目
 		$query = "SELECT DISTINCT typeid From `#@__arctiny` WHERE senddate >=" . $start . " AND arcrank>-1";
 		$dsql->SetQuery($query);
 		$dsql->Execute();
@@ -234,7 +234,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 			DedeCli::write("Make list html successfull");
 		}
 
-		// 生成文档
+		//生成文档
 		$tt = $dsql->GetOne("SELECT COUNT(id) as dd FROM `#@__arctiny` WHERE senddate >=" . $start . " AND arcrank>-1");
 		$total = intval($tt['dd']);
 		$dsql->Execute('out', "SELECT id FROM `#@__arctiny` WHERE senddate >=" . $start . " AND arcrank>-1 ORDER BY typeid ASC");
@@ -248,7 +248,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 		}
 		DedeCli::write("Make archives html successfull");
 		
-		// 优化数据
+		//优化数据
 		OptimizeData($dsql);
 		DedeCli::write("Optimize data successfull");
 	} else {
@@ -274,7 +274,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 	define("DEDEINC", $workDir."/include");
 	require_once(DEDEINC."/dedehttpdown.class.php");
 	require_once(DEDEINC . "/cli.class.php");
-	// 更新系统
+	//更新系统
 	$latestURL = "https://cdn.dedebiz.com/release/latest.txt";
 	$del = new DedeHttpDown();
 	$del->OpenUrl($latestURL);
@@ -292,11 +292,11 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 	$del->OpenUrl($fileHashURL);
 	$filelist = $del->GetJSON();
 	$offFiles = array();
-	// TODO 命令行自动更新
+	//TODO 命令行自动更新
 } else if (count($argv) > 1 && ($argv[1] == "quick" || $argv[1] == "q")){
 	define("DEDEINC", $workDir."/include");
 	require_once(DEDEINC . "/cli.class.php");
-	// 快速开始一个用于开发的DedeBIZ环境，基于SQLite无其他依赖
+	//快速开始一个用于开发的DedeBIZ环境，基于SQLite无其他依赖
 	if (file_exists($workDir."/data/DedeBIZ.db")) {
 		DedeCli::write("development environment has inited");
 		echo "Start Dev Server For DedeBIZ\n\r";
@@ -304,7 +304,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) {
 		passthru(PHP_BINARY . ' -S localhost:8088 -t' . escapeshellarg('./'));
 		exit;
 	}
-	// 初始化安装一个开发环境
+	//初始化安装一个开发环境
 	$db = new SQLite3($workDir.'/data/DedeBIZ.db');
 	$fp = fopen($workDir."/install/common.inc.php","r");
     $configStr1 = fread($fp,filesize($workDir."/install/common.inc.php"));

docs/changelog.md

@@ -1,7 +1,7 @@
 # 更新记录
 通过访问 https://www.dedebiz.com/git 获取完整更新记录
 
-## v6.0.0
+## v6.0.4
 - 调整DedeCMS目录结构，将原有include中外部访问的内容迁移出去；
 - 修正已知存在的安全问题；
 - 升级内置编辑器ckeditor4为最新版本；

src/dede/action_search.php → src/admin/action_search.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 检索操作
  *
  * @version        $Id: action_search.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/actionsearch_class.php → src/admin/actionsearch_class.php

@@ -1,9 +1,8 @@
 <?php
-
 /**
  * @version        $Id: actionsearch_class.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -80,11 +79,11 @@ class ActionSearch
             foreach ($text as $key => $value) {
                 if ($key == 'title' || $key == 'description') {
                     //仅对title,description进行数组替换
-                    $text[$key] = str_replace($this->keyword, '<font color="red">'.$this->keyword.'</font>', $text[$key]);
+                    $text[$key] = str_replace($this->keyword, '<span style="color:#e74d58">'.$this->keyword.'</span>', $text[$key]);
                 }
             }
         } else {
-            $text = str_replace($this->keyword, '<font color="red">'.$this->keyword.'</font>', $text);
+            $text = str_replace($this->keyword, '<span style="color:#e74d58">'.$this->keyword.'</span>', $text);
         }
         return $text;
     }

src/dede/ad_add.php → src/admin/ad_add.php

@@ -1,15 +1,13 @@
 <?php
-
 /**
  * 广告添加
  *
  * @version        $Id: ad_add.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-
 require(dirname(__FILE__)."/config.php");
 CheckPurview('plus_广告管理');
 require_once DEDEINC."/typelink.class.php";

src/dede/ad_edit.php → src/admin/ad_edit.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 广告编辑
  *
  * @version        $Id: ad_edit.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -28,7 +27,7 @@ if ($dopost == 'delete') {
     $row = $dsql->GetOne("SELECT tagname from `#@__myad` WHERE aid='$aid' ");
 
     $showtag = '{'."dede:myad name='{$row['tagname']}'/".'}';
-    $info = "<b>说明：</b>如果嵌入的是织梦CMS广告标签，那么将会解析成标签中的内容到页面，广告更改后需要重新生成。<br />
+    $info = "<b>说明：</b>如果嵌入的是织梦CMS广告标签，那么将会解析成标签中的内容到页面，广告修改后需要重新生成。<br />
     如果不希望重新生成所有页面，则直接调用JS代码即可。
     ";
     $wintitle = "广告管理-获取广告标签";
@@ -63,7 +62,7 @@ if ($dopost == 'delete') {
      WHERE aid='$aid'
      ";
     $dsql->ExecuteNoneQuery($query);
-    ShowMsg("成功更改一则广告代码", $ENV_GOBACK_URL);
+    ShowMsg("成功修改一则广告代码", $ENV_GOBACK_URL);
     exit();
 }
 

src/dede/ad_main.php → src/admin/ad_main.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 广告管理
  *
  * @version        $Id: ad_main.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/adtype_main.php → src/admin/adtype_main.php

@@ -1,18 +1,17 @@
 <?php
-
 /**
  * 友情链接类型
  *
  * @version        $Id: friendlink_type.php 1 8:48 2010年7月13日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__)."/config.php");
 if (empty($dopost)) $dopost = '';
 
-//保存更改
+//保存修改
 if ($dopost == "save") {
     $startID = 1;
     $endID = $idend;

src/dede/album_add.php → src/admin/album_add.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: album_add.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -96,7 +96,7 @@ else if ($dopost == 'save') {
     //处理上传的缩略图
     if (empty($ddisremote)) $ddisremote = 0;
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    // 处理新的缩略图上传
+    //处理新的缩略图上传
     if ($litpic_b64 != "") {
         $data = explode(',', $litpic_b64);
         $ntime = time();
@@ -301,7 +301,7 @@ else if ($dopost == 'save') {
         }
     }
     //返回成功信息
-    $msg = "请选择您的后续操作：<a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>继续发布图片</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>更改图集</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>预览文档</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>已发布图片管理</a>&nbsp;&nbsp;$backurl";
+    $msg = "请选择您的后续操作：<a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>继续发布图片</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改图集</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>预览文档</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>已发布图片管理</a>&nbsp;&nbsp;$backurl";
     $msg = "<div style=\"line-height:36px;height:36px\">{$msg}</div>".GetUpdateTest();
 
     $wintitle = "成功发布一个图集";

src/dede/album_edit.php → src/admin/album_edit.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: album_edit.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -112,7 +112,7 @@ else if ($dopost == 'save') {
         $ddisremote = 0;
     }
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    // 处理新的缩略图上传
+    //处理新的缩略图上传
     if ($litpic_b64 != "") {
         $data = explode(',', $litpic_b64);
         $ntime = time();
@@ -280,7 +280,7 @@ else if ($dopost == 'save') {
     }
     if ($albums !== "") {
         $albumsArr  = json_decode(stripslashes($albums), true);
-        // var_dump($albumsArr);exit;
+        //var_dump($albumsArr);exit;
         for ($i = 0; $i <= count($albumsArr) - 1; $i++) {
             $album = $albumsArr[$i];
             $data = explode(',', $album['img']);
@@ -367,11 +367,11 @@ else if ($dopost == 'save') {
         }
     }
     //返回成功信息
-    $msg = "请选择您的后续操作：<a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>继续发布图片</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>查看更改</a>&nbsp;&nbsp;<a href='$arcUrl' target='_blank' class='btn btn-success btn-sm'>预览文档</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理已发布图片</a>&nbsp;&nbsp;$backurl";
-    $wintitle = "成功更改图集";
-    $wecome_info = "文章管理::更改图集";
+    $msg = "请选择您的后续操作：<a href='album_add.php?cid=$typeid' class='btn btn-success btn-sm'>继续发布图片</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>查看修改</a>&nbsp;&nbsp;<a href='$arcUrl' target='_blank' class='btn btn-success btn-sm'>预览文档</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理已发布图片</a>&nbsp;&nbsp;$backurl";
+    $wintitle = "成功修改图集";
+    $wecome_info = "文章管理::修改图集";
     $win = new OxWindow();
-    $win->AddTitle("成功更改一个图集：");
+    $win->AddTitle("成功修改一个图集：");
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", "&nbsp;", false);
     $win->Display();

src/dede/album_testhtml.php → src/admin/album_testhtml.php

@@ -1,15 +1,13 @@
 <?php
-
 /**
  * 图集测试
  *
  * @version        $Id: album_testhtml.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-
 require_once(dirname(__FILE__)."/config.php");
 AjaxHead();
 $myhtml = UnicodeUrl2Gbk(stripslashes($myhtml));

src/dede/archives_add.php → src/admin/archives_add.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: archives_add.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -97,7 +97,7 @@ else if ($dopost == 'save') {
         $ddisremote = 0;
     }
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    // 处理新的缩略图上传
+    //处理新的缩略图上传
     if ($litpic_b64 != "") {
         $data = explode(',', $litpic_b64);
         $ntime = time();
@@ -187,7 +187,7 @@ else if ($dopost == 'save') {
         }
     }
     //返回成功信息
-    $msg = "请选择您的后续操作：<a href='archives_add.php?cid=$typeid' class='btn btn-success btn-sm'>继续发布文档</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看文档</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>更改文档</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>已发布文档管理</a>&nbsp;&nbsp;$backurl";
+    $msg = "请选择您的后续操作：<a href='archives_add.php?cid=$typeid' class='btn btn-success btn-sm'>继续发布文档</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看文档</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改文档</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>已发布文档管理</a>&nbsp;&nbsp;$backurl";
     $msg = "<div style=\"line-height:36px;height:36px\">{$msg}</div>".GetUpdateTest();
     $wintitle = '成功发布文档';
     $wecome_info = '文档管理::发布文档';

src/dede/archives_do.php → src/admin/archives_do.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: archives_do.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -317,11 +317,11 @@ else if ($dopost == 'moveArchives') {
         echo "<table width='100%' style='display:inline-block;z-index:9000'>";
         ?>
         <tr height='26'>
-            <td width="80" class='bline'>&nbsp;目标栏目：</td>
+            <td width="86" class='bline'>&nbsp;目标栏目：</td>
             <td class='bline'><?php echo $typeOptions; ?></td>
         </tr>
         <tr height='26'>
-            <td width="80" class='bline'>&nbsp;文档ID：</td>
+            <td width="86" class='bline'>&nbsp;文档ID：</td>
             <td class='bline'>
                 <input type='text' name='tmpids' value="<?php echo $qstr; ?>" style='width:320px;overflow:hidden'>
                 <br>移动到的目标栏目必须和选定的文档频道类型一致，否则程序会自动勿略不符合的文档。
@@ -522,7 +522,7 @@ else if ($dopost == 'quickEdit') {
     echo "<table width='100%' style='display:inline-block;z-index:9000'>";
     ?>
     <tr height='26'>
-        <td width="80" class='bline'>&nbsp;所属栏目：</td>
+        <td width="86" class='bline'>&nbsp;所属栏目：</td>
         <td class='bline'>
             <?php
             $typeOptions = GetOptionList($arcRow['typeid'], $cuserLogin->getUserChannel(), $arcRow['channel']);
@@ -534,7 +534,7 @@ else if ($dopost == 'quickEdit') {
         </td>
     </tr>
     <tr height='26'>
-        <td width="80" class='bline'>&nbsp;属性：</td>
+        <td width="86" class='bline'>&nbsp;属性：</td>
         <td class='bline'>
             <input type='hidden' name='oldflag' value='<?php echo $arcRow['flag']; ?>'>
             <?php
@@ -551,15 +551,15 @@ else if ($dopost == 'quickEdit') {
         </td>
     </tr>
     <tr height='26'>
-        <td width="80" class='bline'>&nbsp;标题：</td>
+        <td width="86" class='bline'>&nbsp;标题：</td>
         <td class='bline'><input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>" style="width:320px"></td>
     </tr>
     <tr height='26'>
-        <td width="80" class='bline'>&nbsp;简略标题：</td>
+        <td width="86" class='bline'>&nbsp;简略标题：</td>
         <td class='bline'><input name="shorttitle" type="text" id="shorttitle" value="<?php echo $arcRow['shorttitle']; ?>" style="width:320px"></td>
     </tr>
     <tr height='26'>
-        <td width="80" class='bline'>&nbsp;阅读权限：</td>
+        <td width="86" class='bline'>&nbsp;阅读权限：</td>
         <td class='bline'>
             <select name="arcrank" id="arcrank" style="width:100px">
                 <option value='<?php echo $arcRow["arcrank"] ?>'>
@@ -577,7 +577,7 @@ else if ($dopost == 'quickEdit') {
         </td>
     </tr>
     <tr height='26'>
-        <td width="80" class='bline'>&nbsp;关键字：</td>
+        <td width="86" class='bline'>&nbsp;关键字：</td>
         <td class='bline'><input name="keywords" type="text" id="keywords" value="<?php echo $arcRow['keywords']; ?>" style="width:320px"></td>
     </tr>
     <tr height='36'>
@@ -839,7 +839,7 @@ else if ($dopost == 'attsDlg') {
     echo "<table width='100%' style='display:inline-block;z-index:9000'>";
 ?>
     <tr height='26'>
-        <td width="80" class='bline'>&nbsp;属性：</td>
+        <td width="86" class='bline'>&nbsp;属性：</td>
         <td class='bline'>
             <input type='hidden' name='oldflag' value='<?php echo $arcRow['flag']; ?>'>
             <?php
@@ -853,7 +853,7 @@ else if ($dopost == 'attsDlg') {
         </td>
     </tr>
     <tr height='26'>
-        <td width="80" class='bline'>&nbsp;文档ID：</td>
+        <td width="86" class='bline'>&nbsp;文档ID：</td>
         <td class='bline'><input type='text' name='tmpids' value="<?php echo $qstr; ?>" style='width:320px;overflow:hidden'></td>
     </tr>
     <tr height='36'>

src/dede/archives_edit.php → src/admin/archives_edit.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: archives_edit.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -199,11 +199,11 @@ else if ($dopost == 'save') {
         }
     }
     //返回成功信息
-    $msg = "请选择您的后续操作：<a href='archives_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布新文档</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>查看更改</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看文档</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理文档</a>&nbsp;&nbsp;$backurl";
-    $wintitle = "成功更改文档";
-    $wecome_info = "文档管理::更改文档";
+    $msg = "请选择您的后续操作：<a href='archives_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布新文档</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>查看修改</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看文档</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理文档</a>&nbsp;&nbsp;$backurl";
+    $wintitle = "成功修改文档";
+    $wecome_info = "文档管理::修改文档";
     $win = new OxWindow();
-    $win->AddTitle("成功更改文档：");
+    $win->AddTitle("成功修改文档：");
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", "&nbsp;", false);
     $win->Display();

src/dede/archives_sg_add.php → src/admin/archives_sg_add.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: archives_sg_add.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -80,7 +80,7 @@ else if ($dopost == 'save') {
         $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
         $fullUrl = $fullUrl.".png";
         file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        // 加水印
+        //加水印
         WaterImg($cfg_basedir.$fullUrl, 'up');
         $litpic = $fullUrl;
     }
@@ -141,7 +141,7 @@ else if ($dopost == 'save') {
     }
     ClearMyAddon($arcID, $title);
     //返回成功信息
-    $msg = "请选择您的后续操作：<a href='archives_sg_add.php?cid=$typeid' class='btn btn-success btn-sm'>继续发布文档</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看文档</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>更改文档</a>&nbsp;&nbsp;<a href='content_sg_list.php?cid=$typeid&channelid={$channelid}&dopost=listArchives' class='btn btn-success btn-sm'>已发布文档管理</a>&nbsp;&nbsp;<a href='catalog_main.php' class='btn btn-success btn-sm'>网站栏目管理</a>";
+    $msg = "请选择您的后续操作：<a href='archives_sg_add.php?cid=$typeid' class='btn btn-success btn-sm'>继续发布文档</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看文档</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改文档</a>&nbsp;&nbsp;<a href='content_sg_list.php?cid=$typeid&channelid={$channelid}&dopost=listArchives' class='btn btn-success btn-sm'>已发布文档管理</a>&nbsp;&nbsp;<a href='catalog_main.php' class='btn btn-success btn-sm'>网站栏目管理</a>";
     $wintitle = "成功发布文档";
     $wecome_info = "文档管理::发布文档";
     $win = new OxWindow();

src/dede/archives_sg_edit.php → src/admin/archives_sg_edit.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: archives_sg_edit.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -79,7 +79,7 @@ else if ($dopost == 'save') {
         $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
         $fullUrl = $fullUrl.".png";
         file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1]));
-        // 加水印
+        //加水印
         WaterImg($cfg_basedir.$fullUrl, 'up');
         $litpic = $fullUrl;
     }
@@ -128,11 +128,11 @@ else if ($dopost == 'save') {
     if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$id";
     ClearMyAddon($id, $title);
     //返回成功信息
-    $msg = "请选择您的后续操作：<a href='archives_sg_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布新文档</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>查看更改</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看文档</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&channelid={$channelid}&dopost=listArchives' class='btn btn-success btn-sm'>管理文档</a>&nbsp;&nbsp;<a href='catalog_main.php' class='btn btn-success btn-sm'>网站栏目管理</a>";
-    $wintitle = "成功更改文档";
-    $wecome_info = "文档管理::更改文档";
+    $msg = "请选择您的后续操作：<a href='archives_sg_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布新文档</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>查看修改</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看文档</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&channelid={$channelid}&dopost=listArchives' class='btn btn-success btn-sm'>管理文档</a>&nbsp;&nbsp;<a href='catalog_main.php' class='btn btn-success btn-sm'>网站栏目管理</a>";
+    $wintitle = "成功修改文档";
+    $wecome_info = "文档管理::修改文档";
     $win = new OxWindow();
-    $win->AddTitle("成功更改文档：");
+    $win->AddTitle("成功修改文档：");
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", "&nbsp;", false);
     $win->Display();

src/dede/article_add.php → src/admin/article_add.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: article_add.php 2020年9月14日 tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -223,7 +223,7 @@ else if ($dopost == 'save') {
         }
     }
     //返回成功信息
-    $msg = "请选择您的后续操作：<a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>继续发布文章</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看文章</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>更改文章</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>已发布文章管理</a>&nbsp;&nbsp;$backurl";
+    $msg = "请选择您的后续操作：<a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>继续发布文章</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看文章</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$arcID."&dopost=editArchives' class='btn btn-success btn-sm'>修改文章</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>已发布文章管理</a>&nbsp;&nbsp;$backurl";
     $msg = "<div style=\"line-height:36px;height:36px\">{$msg}</div>".GetUpdateTest();
     $wintitle = "成功发布文章";
     $wecome_info = "文章管理::发布文章";

src/dede/article_allowurl_edit.php → src/admin/article_allowurl_edit.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 允许的站内链接
  *
  * @version        $Id: article_allowurl_edit.php 1 11:36 2010年10月8日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/article_coonepage_rule.php → src/admin/article_coonepage_rule.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 文档规则采集
  *
  * @version        $Id: article_coonepage_rule.php 1 14:12 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -100,7 +99,7 @@ function _EditNoteLoad(){ }
         <td colspan="2"><textarea name="rule" style="width:300px;height:80px"><?php echo $row['rule']; ?></textarea></td>
       </tr>
       <tr>
-        <td height="32">&nbsp;</td>
+        <td height="30">&nbsp;</td>
         <td colspan="2"><button class="btn btn-success btn-sm" type="submit" name="Submit" value="">保存规则</button>
           <button type="reset" class="btn btn-success btn-sm" name="Submit2">重置</button></td>
       </tr>

src/dede/article_description_main.php → src/admin/article_description_main.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 文档描述管理
  *
  * @version        $Id: article_description_main.php 1 14:12 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/article_edit.php → src/admin/article_edit.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: article_edit.php 1 14:12 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -214,11 +214,11 @@ else if ($dopost == 'save') {
     }
 
     //返回成功信息
-    $msg = "请选择您的后续操作：<a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布新文章</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>查看更改</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看文章</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理文章</a>&nbsp;&nbsp;$backurl";
-    $wintitle = "成功更改文章";
-    $wecome_info = "文章管理::更改文章";
+    $msg = "请选择您的后续操作：<a href='article_add.php?cid=$typeid' class='btn btn-success btn-sm'>发布新文章</a>&nbsp;&nbsp;<a href='archives_do.php?aid=".$id."&dopost=editArchives' class='btn btn-success btn-sm'>查看修改</a>&nbsp;&nbsp;<a href='$artUrl' target='_blank' class='btn btn-success btn-sm'>查看文章</a>&nbsp;&nbsp;<a href='catalog_do.php?cid=$typeid&dopost=listArchives' class='btn btn-success btn-sm'>管理文章</a>&nbsp;&nbsp;$backurl";
+    $wintitle = "成功修改文章";
+    $wecome_info = "文章管理::修改文章";
     $win = new OxWindow();
-    $win->AddTitle("成功更改文章：");
+    $win->AddTitle("成功修改文章：");
     $win->AddMsgItem($msg);
     $winform = $win->GetWindow("hand", "&nbsp;", false);
     $win->Display();

src/dede/article_keywords_main.php → src/admin/article_keywords_main.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 文档关键词管理
  *
  * @version        $Id: article_keywords_main.php 1 14:12 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -16,11 +15,11 @@ setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/");
 if (empty($dopost)) $dopost = '';
 
 
-//保存批量更改
+//保存批量修改
 if ($dopost == 'saveall') {
     $ENV_GOBACK_URL = empty($_COOKIE['ENV_GOBACK_URL']) ? "article_keywords_main.php" : $_COOKIE['ENV_GOBACK_URL'];
     if (!isset($aids)) {
-        ShowMsg("您没有选择要更改的内容！", $ENV_GOBACK_URL);
+        ShowMsg("您没有选择要修改的内容！", $ENV_GOBACK_URL);
         exit();
     }
     foreach ($aids as $aid) {
@@ -49,7 +48,7 @@ if ($dopost == 'saveall') {
             $dsql->ExecuteNoneQuery($query1);
         }
     }
-    ShowMsg("完成指定的更改！", $ENV_GOBACK_URL);
+    ShowMsg("完成指定的修改！", $ENV_GOBACK_URL);
     exit();
 }
 //增加关键字

src/dede/article_keywords_make.php → src/admin/article_keywords_make.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 文档关键词生成
  *
  * @version        $Id: article_keywords_make.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/article_keywords_select.php → src/admin/article_keywords_select.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 文档关键词选择
  *
  * @version        $Id: article_keywords_select.php$
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -28,7 +27,7 @@ $dlist->Display();
 function GetSta($sta)
 {
     if ($sta == 1) return "正常";
-    else return "<font color='red'>禁用</font>";
+    else return "<span style='color:#e74d58'>禁用</span>";
 }
 
 function GetMan($sta)

src/dede/article_select_sw.php → src/admin/article_select_sw.php

@@ -1,9 +1,8 @@
 <?php
-
 /**
  * @version        $Id: article_select_sw.php 1 8:26 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/article_source_edit.php → src/admin/article_source_edit.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 文章来源编辑
  *
  * @version        $Id: archives_add.php 1 14:30 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/article_string_mix.php → src/admin/article_string_mix.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 防采集混淆字符串管理
  *
  * @version        $Id: article_string_mix.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/article_template_rand.php → src/admin/article_template_rand.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 文档随机模板
  *
  * @version        $Id: article_template_rand.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/article_test_same.php → src/admin/article_test_same.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 检测重复文档
  *
  * @version        $Id: article_test_same.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/article_test_title.php → src/admin/article_test_title.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 检测重复文档
  *
  * @version        $Id: article_test_same.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/article_writer_edit.php → src/admin/article_writer_edit.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 文章作者管理
  *
  * @version        $Id: article_writer_edit.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/baidunews.php → src/admin/baidunews.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 百度新闻
  *
  * @version        $Id: baidunews.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/cards_make.php → src/admin/cards_make.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 生成点卡
  *
  * @version        $Id: cards_make.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/cards_manage.php → src/admin/cards_manage.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 点卡管理
  *
  * @version        $Id: cards_manage.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/cards_type.php → src/admin/cards_type.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 点卡类型
  *
  * @version        $Id: cards_type.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -13,7 +12,7 @@ require_once(dirname(__FILE__).'/config.php');
 CheckPurview('member_Type');
 if (empty($dopost)) $dopost = "";
 
-//保存更改
+//保存修改
 if ($dopost == "save") {
     $startID = 1;
     $endID = $idend;

src/dede/catalog_add.php → src/admin/catalog_add.php

@@ -1,27 +1,23 @@
 <?php
-
 /**
  * 栏目添加
  *
  * @version        $Id: catalog_add.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @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.class.php");
-
 if (empty($listtype)) $listtype = '';
 if (empty($dopost)) $dopost = '';
 if (empty($upinyin)) $upinyin = 0;
 if (empty($channelid)) $channelid = 1;
 if (isset($channeltype)) $channelid = $channeltype;
-
 $id = empty($id) ? 0 : intval($id);
 $reid = empty($reid) ? 0 : intval($reid);
 $nid = 'article';
-
 if ($id == 0 && $reid == 0) {
     CheckPurview('t_New');
 } else {
@@ -29,9 +25,7 @@ if ($id == 0 && $reid == 0) {
     CheckPurview('t_AccNew');
     CheckCatalog($checkID, '您无权在本栏目下创建子类');
 }
-
 if (empty($myrow)) $myrow = array();
-
 $dsql->SetQuery("SELECT id,typename,nid FROM `#@__channeltype` WHERE id<>-1 AND isshow=1 ORDER BY id");
 $dsql->Execute();
 while ($row = $dsql->GetObject()) {
@@ -49,17 +43,15 @@ if ($dopost == 'quick') {
 }
 /*---------------------
 function action_savequick(){ }
----------------------*/ else if ($dopost == 'savequick') {
+---------------------*/
+else if ($dopost == 'savequick') {
     if (!isset($savetype)) $savetype = '';
     $isdefault = isset($isdefault) ? $isdefault : 0;
     $tempindex = "{style}/index_{$nid}.htm";
     $templist = "{style}/list_{$nid}.htm";
     $temparticle = "{style}/article_{$nid}.htm";
-    $queryTemplate = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,typedir,isdefault,defaultname,issend,channeltype,
-    tempindex,templist,temparticle,modname,namerule,namerule2,ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`cross`,`crossid`,`content`,`smalltypes`)
-    VALUES('~reid~','~topid~','~rank~','~typename~','~typedir~','$isdefault','$defaultname','$issend','$channeltype',
-    '$tempindex','$templist','$temparticle','default','$namerule','$namerule2','0','0','','','~typename~','0','','','0','0','0','','')";
-
+    $queryTemplate = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,namegk,enname,ennamegk,litpic,litimg,typedir,isdefault,defaultname,issend,channeltype,tempindex,templist,temparticle,modname,namerule,namerule2,ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`cross`,`crossid`,`content`,`smalltypes`)
+    VALUES('~reid~','~topid~','~rank~','~typename~','~namegk~','~enname~','~ennamegk~','~litpic~','~litimg~','~typedir~','$isdefault','$defaultname','$issend','$channeltype','$tempindex','$templist','$temparticle','default','$namerule','$namerule2','0','0','','','~typename~','0','','','0','0','0','','')";
     if (empty($savetype)) {
         foreach ($_POST as $k => $v) {
             if (preg_match("#^posttype#", $k)) {
@@ -100,8 +92,6 @@ function action_savequick(){ }
             }
         }
     } else {
-
-
         $row = $dsql->GetOne("SELECT `typedir` FROM `#@__arctype` WHERE `id`={$reid}");
         foreach ($_POST as $k => $v) {
             if (preg_match("#^posttype#", $k)) {
@@ -123,7 +113,6 @@ function action_savequick(){ }
                     $toptypedir = '/'.$toptypedir;
                     break;
             }
-
             if (empty($toptypename)) {
                 continue;
             }
@@ -141,18 +130,16 @@ function action_savequick(){ }
 }
 /*---------------------
 function action_save(){ }
----------------------*/ else if ($dopost == 'save') {
+---------------------*/
+else if ($dopost == 'save') {
     $smalltypes = '';
     if (empty($smalltype)) $smalltype = '';
     if (is_array($smalltype)) $smalltypes = join(',', $smalltype);
-
     if (!isset($sitepath)) $sitepath = '';
     if ($topid == 0 && $reid > 0) $topid = $reid;
     if ($ispart != 0) $cross = 0;
-
     $description = Html2Text($description, 1);
     $keywords = Html2Text($keywords, 1);
-
     if ($ispart != 2) {
         //栏目的参照目录
         if ($referpath == 'cmspath') $nextdir = '{cmspath}';
@@ -164,11 +151,9 @@ function action_save(){ }
         $typedir = $nextdir.'/'.$typedir;
         $typedir = preg_replace("#\/{1,}#", "/", $typedir);
     }
-
     //开启多站点时的设置(仅针对顶级栏目)
     if ($reid == 0 && $moresite == 1) {
         $sitepath = $typedir;
-
         //检测二级网址
         if ($siteurl != '') {
             $siteurl = preg_replace("#\/$#", "", $siteurl);
@@ -182,7 +167,6 @@ function action_save(){ }
             }
         }
     }
-
     //创建目录
     if ($ispart != 2) {
         $true_typedir = str_replace("{cmspath}", $cfg_cmspath, $typedir);
@@ -192,14 +176,8 @@ function action_save(){ }
             exit();
         }
     }
-
-    $in_query = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,typedir,isdefault,defaultname,issend,channeltype,
-    tempindex,templist,temparticle,modname,namerule,namerule2,
-    ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`cross`,`crossid`,`content`,`smalltypes`)
-    VALUES('$reid','$topid','$sortrank','$typename','$typedir','$isdefault','$defaultname','$issend','$channeltype',
-    '$tempindex','$templist','$temparticle','default','$namerule','$namerule2',
-    '$ispart','$corank','$description','$keywords','$seotitle','$moresite','$siteurl','$sitepath','$ishidden','$cross','$crossid','$content','$smalltypes')";
-
+    $in_query = "INSERT INTO `#@__arctype`(reid,topid,sortrank,typename,namegk,enname,ennamegk,litpic,litimg,typedir,isdefault,defaultname,issend,channeltype,tempindex,templist,temparticle,modname,namerule,namerule2,ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`cross`,`crossid`,`content`,`smalltypes`)
+    VALUES('$reid','$topid','$sortrank','$typename','$namegk','$enname','$ennamegk','$litpic','$litimg','$typedir','$isdefault','$defaultname','$issend','$channeltype','$tempindex','$templist','$temparticle','default','$namerule','$namerule2','$ispart','$corank','$description','$keywords','$seotitle','$moresite','$siteurl','$sitepath','$ishidden','$cross','$crossid','$content','$smalltypes')";
     if (!$dsql->ExecuteNoneQuery($in_query)) {
         ShowMsg("保存目录数据时失败，请检查您的输入资料是否存在问题", "-1");
         exit();
@@ -210,8 +188,7 @@ function action_save(){ }
     }
     ShowMsg("成功创建一个分类", "catalog_main.php");
     exit();
-} //End dopost==save
-
+}//End dopost==save
 //获取从父目录继承的默认参数
 if ($dopost == '') {
     $channelid = 1;
@@ -229,9 +206,7 @@ if ($dopost == '') {
         $topid = $myrow['topid'];
         $typedir = $myrow['typedir'];
     }
-
     //父栏目是否为二级站点
     $moresite = empty($myrow['moresite']) ? 0 : $myrow['moresite'];
 }
-
 include DedeInclude('templets/catalog_add.htm');

src/dede/catalog_del.php → src/admin/catalog_del.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 删除栏目
  *
  * @version        $Id: catalog_del.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/catalog_do.php → src/admin/catalog_do.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 栏目操作
  *
  * @version        $Id: catalog_do.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -97,14 +96,14 @@ function ViewSgPage()
     exit();
 }
 /*------------------------
-更改栏目排列顺序
+修改栏目排列顺序
 function upRank()
 ------------------------*/ else if ($dopost == "upRank") {
     //检查权限许可
     CheckPurview('t_Edit,t_AccEdit');
 
     //检查栏目操作许可
-    CheckCatalog($cid, "您无权更改本栏目");
+    CheckCatalog($cid, "您无权修改本栏目");
     $row = $dsql->GetOne("SELECT reid,sortrank FROM #@__arctype WHERE id='$cid'");
     $reid = $row['reid'];
     $sortrank = $row['sortrank'];
@@ -224,7 +223,7 @@ function unitCatalog() { }
         $win->AddHidden('channelid', $channelid);
         $win->AddHidden('nextjob', 'unitok');
         $win->AddTitle("合并目录时不会删除原来的栏目目录，合并后需手动更新目标栏目的文档HTML和列表HTML。");
-        $win->AddItem('您选择的栏目是：', "<font color='red'>$typename($typeid)</font>");
+        $win->AddItem('您选择的栏目是：', "<span style='color:#e74d58'>$typename($typeid)</span>");
         $win->AddItem('您希望合并到那个栏目？', "<select name='unittype'>\r\n{$typeOptions}\r\n</select>");
         $win->AddItem('注意事项：', '栏目不能有下级子栏目，只允许子级到更高级或同级或不同父级的情况。');
         $winform = $win->GetWindow('ok');

src/dede/catalog_edit.php → src/admin/catalog_edit.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: catalog_edit.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -15,7 +15,7 @@ $id = isset($id) ? intval($id) : 0;
 //检查权限许可
 CheckPurview('t_Edit,t_AccEdit');
 //检查栏目操作许可
-CheckCatalog($id, '您无权更改本栏目');
+CheckCatalog($id, '您无权修改本栏目');
 /*-----------------------
 function action_save()
 ----------------------*/
@@ -57,7 +57,7 @@ if ($dopost == "save") {
     $uptopsql
     WHERE id='$id' ";
     if (!$dsql->ExecuteNoneQuery($upquery)) {
-        ShowMsg("保存当前栏目更改时失败，请检查您的输入资料是否存在问题", "-1");
+        ShowMsg("保存当前栏目修改时失败，请检查您的输入资料是否存在问题", "-1");
         exit();
     }
     //如果选择子栏目可投稿，更新顶级栏目为可投稿
@@ -70,7 +70,7 @@ if ($dopost == "save") {
         $upquery = "UPDATE `#@__arctype` SET moresite='$moresite', siteurl='$siteurl',sitepath='$sitepath',ishidden='$ishidden' WHERE 1=1 AND $slinks";
         $dsql->ExecuteNoneQuery($upquery);
     }
-    //更改子栏目属性
+    //修改子栏目属性
     if (!empty($upnext)) {
     $upquery = "UPDATE `#@__arctype` SET
     issend='$issend',
@@ -84,12 +84,12 @@ if ($dopost == "save") {
     ishidden='$ishidden'
     WHERE 1=1 AND $slinks";
         if (!$dsql->ExecuteNoneQuery($upquery)) {
-            ShowMsg("更改当前栏目成功，但更改下级栏目属性时失败", "-1");
+            ShowMsg("修改当前栏目成功，但修改下级栏目属性时失败", "-1");
             exit();
         }
     }
     UpDateCatCache();
-    ShowMsg("成功更改一个分类", "catalog_main.php");
+    ShowMsg("成功修改一个分类", "catalog_main.php");
     exit();
 } //End Save Action
 else if ($dopost == "savetime") {
@@ -119,11 +119,11 @@ else if ($dopost == "savetime") {
     corank='$corank' $uptopsql
     WHERE id='$id' ";
     if (!$dsql->ExecuteNoneQuery($upquery)) {
-        ShowMsg("保存当前栏目更改时失败，请检查您的输入资料是否存在问题", "-1");
+        ShowMsg("保存当前栏目修改时失败，请检查您的输入资料是否存在问题", "-1");
         exit();
     }
     UpDateCatCache();
-    ShowMsg("成功更改一个分类", "catalog_main.php");
+    ShowMsg("成功修改一个分类", "catalog_main.php");
     exit();
 }
 //读取栏目信息
@@ -159,11 +159,6 @@ if ($dopost == 'time') {
         <input type="hidden" name="topid" value="<?php echo $myrow['topid']; ?>">
         <input type="hidden" name="moresite" value="<?php echo $myrow['moresite']; ?>">
         <table width="100%" border="0" cellpadding="0" cellspacing="0">
-            <tr>
-                <td class='bline' height="26" align="center" colspan="2">
-                    <a href='catalog_edit.php?id=<?php echo $id; ?>'>当前是快捷编辑模式，您要修改更详细的参数，请使用高级模式</a>
-                </td>
-            </tr>
             <tr>
                 <td width="150" class='bline' height="26" align="center">是否支持投稿：</td>
                 <td class='bline'>
@@ -179,7 +174,7 @@ if ($dopost == 'time') {
                         if ($k == $channelid) echo "{$arr['typename']} | {$arr['nid']}";
                     }
                     ?>
-                    <a href='catalog_edit.php?id=<?php echo $id; ?>' class='btn btn-success btn-sm'>修改</a>
+                    <a href='catalog_edit.php?id=<?php echo $id; ?>' class='btn btn-success btn-sm'>更多模型</a>
                 </td>
             </tr>
             <tr>
@@ -216,7 +211,8 @@ if ($dopost == 'time') {
                 <td class='bline'>
                     <label><input type='radio' name='isdefault' value='1' class='np' <?php if ($myrow['isdefault'] == 1) echo " checked='1' "; ?>>&nbsp;链接到默认页</label>
                     <label><input type='radio' name='isdefault' value='0' class='np' <?php if ($myrow['isdefault'] == 0) echo " checked='1' "; ?>>&nbsp;链接到列表第一页</label>
-                    <label><input type='radio' name='isdefault' value='-1' class='np' <?php if ($myrow['isdefault'] == -1) echo " checked='1' "; ?>>&nbsp;使用动态页</label></td>
+                    <label><input type='radio' name='isdefault' value='-1' class='np' <?php if ($myrow['isdefault'] == -1) echo " checked='1' "; ?>>&nbsp;使用动态页</label>
+                </td>
             </tr>
             <tr>
                 <td class='bline' height="26" align="center">默认页的名称：</td>

src/dede/catalog_main.php → src/admin/catalog_main.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 栏目管理
  *
  * @version        $Id: catalog_main.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/catalog_menu.php → src/admin/catalog_menu.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 栏目菜单
  *
  * @version        $Id: catalog_menu.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/config.php → src/admin/config.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: config.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -40,7 +40,7 @@ if (!isset($GLOBALS['csrf_token']) || $GLOBALS['csrf_token'] === null) {
 if (strtoupper($_SERVER['REQUEST_METHOD']) !== 'POST') {
     PutCookie('dede_csrf_token', $GLOBALS['csrf_token'], 7200, '/');
 }
-//获得当前脚本名称，如果您的系统被禁用了$_SERVER变量，请自行更改这个选项
+//获得当前脚本名称，如果您的系统被禁用了$_SERVER变量，请自行修改这个选项
 $dedeNowurl = $s_scriptName = '';
 $isUrlOpen = @ini_get('allow_url_fopen');
 $dedeNowurl = GetCurUrl();

src/dede/content_att.php → src/admin/content_att.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 内容属性
  *
  * @version        $Id: content_att.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -13,7 +12,7 @@ require_once(dirname(__FILE__)."/config.php");
 CheckPurview('sys_Att');
 if (empty($dopost)) $dopost = '';
 
-//保存更改
+//保存修改
 if ($dopost == "save") {
     $startID = 1;
     $endID = $idend;

src/dede/content_batch_up.php → src/admin/content_batch_up.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 内容处理函数
  *
  * @version        $Id: content_batch_up.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/content_batchup_action.php → src/admin/content_batchup_action.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 内容处理函数
  *
  * @version        $Id: content_batch_up.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/content_i_list.php → src/admin/content_i_list.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 内容列表
  *
  * @version        $Id: content_i_list.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/content_list.php → src/admin/content_list.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * 内容列表
  * content_s_list.php、content_i_list.php、content_select_list.php
@@ -7,7 +6,7 @@
  *
  * @version        $Id: content_list.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -15,22 +14,17 @@ require_once(dirname(__FILE__).'/config.php');
 require_once(DEDEINC.'/typelink.class.php');
 require_once(DEDEINC.'/datalistcp.class.php');
 require_once(DEDEADMIN.'/inc/inc_list_functions.php');
-
 $cid = isset($cid) ? intval($cid) : 0;
 $channelid = isset($channelid) ? intval($channelid) : 0;
 $mid = isset($mid) ? intval($mid) : 0;
-
 if (!isset($keyword)) $keyword = '';
 if (!isset($flag)) $flag = '';
 if (!isset($f)) $f = '';
 if (!isset($arcrank)) $arcrank = '';
 if (!isset($dopost)) $dopost = '';
-
 $arcrank = RemoveXSS($arcrank);
-
 //检查权限许可，总权限
 CheckPurview('a_List,a_AccList,a_MyList');
-
 //栏目浏览许可
 $userCatalogSql = '';
 if (TestPurview('a_List')) {;
@@ -48,7 +42,6 @@ $adminid = $cuserLogin->getUserID();
 $maintable = '#@__archives';
 setcookie('ENV_GOBACK_URL', $dedeNowurl, time() + 3600, '/');
 $tl = new TypeLink($cid);
-
 //----------------------------------------
 //在不指定排序条件和关键字的情况下直接统计微表
 //----------------------------------------
@@ -82,12 +75,11 @@ if (empty($totalresult) && empty($keyword) && empty($orderby) && empty($flag)) {
     if (count($tinyQuerys) > 0) {
         $tinyQuery = "WHERE ".join(' AND ', $tinyQuerys);
     }
-    // 缓存处理
+    //缓存处理
     $sql = "SELECT COUNT(*) AS dd FROM `#@__arctiny` $tinyQuery ";
     $arr = $dsql->GetOne($sql);
     $totalresult = $arr['dd'];
 }
-
 if ($cid == 0) {
     if ($channelid == 0) {
         $positionname = '所有栏目&gt;';
@@ -100,7 +92,6 @@ if ($cid == 0) {
 } else {
     $positionname = str_replace($cfg_list_symbol, " &gt; ", $tl->GetPositionName())." &gt; ";
 }
-
 //当选择的是单表模型栏目时，直接跳转到单表模型管理区
 if (
     empty($channelid)
@@ -112,12 +103,9 @@ if ($channelid < -1) {
     header("location:content_sg_list.php?f=$f&cid=$cid&channelid=$channelid&keyword=$keyword");
     exit();
 }
-
-
-// 栏目大于800则需要缓存数据
+//栏目大于800则需要缓存数据
 $optHash = md5($cid.serialize($admin_catalogs).$channelid);
 $optCache = DEDEDATA."/tplcache/inc_option_$optHash.inc";
-
 $typeCount = 0;
 if (file_exists($cache1)) require_once($cache1);
 else $cfg_Cs = array();
@@ -132,16 +120,12 @@ if ($typeCount > 800) {
 } else {
     $optionarr = $tl->GetOptionArray($cid, $admin_catalogs, $channelid);
 }
-
 $whereSql = empty($channelid) ? " WHERE arc.channel > 0  AND arc.arcrank > -2 " : " WHERE arc.channel = '$channelid' AND arc.arcrank > -2 ";
-
 $flagsArr = '';
 $dsql->Execute('f', 'SELECT * FROM `#@__arcatt` ORDER BY sortid ASC');
 while ($frow = $dsql->GetArray('f')) {
     $flagsArr .= ($frow['att'] == $flag ? "<option value='{$frow['att']}' selected>{$frow['attname']}</option>\r\n" : "<option value='{$frow['att']}'>{$frow['attname']}</option>\r\n");
 }
-
-
 if (!empty($userCatalogSql)) {
     $whereSql .= " AND ".$userCatalogSql;
 }
@@ -163,22 +147,17 @@ if ($arcrank != '') {
 } else {
     $CheckUserSend = "<button type='button' class='btn btn-success btn-sm' onClick=\"location='catalog_do.php?cid=".$cid."&dopost=listArchives&arcrank=-1&gurl=content_list.php';\">稿件审核</button>";
 }
-
 $orderby = empty($orderby) ? 'id' : preg_replace("#[^a-z0-9]#", "", $orderby);
 $orderbyField = 'arc.'.$orderby;
-
 $query = "SELECT arc.id,arc.typeid,arc.senddate,arc.flag,arc.ismake,
 arc.channel,arc.arcrank,arc.click,arc.title,arc.color,arc.litpic,arc.pubdate,arc.mid
 FROM `$maintable` arc
 $whereSql
 ORDER BY $orderbyField DESC";
-
 if (empty($f) || !preg_match("#form#", $f)) $f = 'form1.arcid1';
-
 //初始化
 $dlist = new DataListCP();
-$dlist->pageSize = 30;
-
+$dlist->pageSize = 40;
 //GET参数
 $dlist->SetParameter('dopost', 'listArchives');
 $dlist->SetParameter('keyword', $keyword);
@@ -189,15 +168,11 @@ $dlist->SetParameter('orderby', $orderby);
 $dlist->SetParameter('arcrank', $arcrank);
 $dlist->SetParameter('channelid', $channelid);
 $dlist->SetParameter('f', $f);
-
 //模板
 if (empty($s_tmplets)) $s_tmplets = 'templets/content_list.htm';
 $dlist->SetTemplate(DEDEADMIN.'/'.$s_tmplets);
-
 //查询
 $dlist->SetSource($query);
-
 //显示
 $dlist->Display();
-// echo $dlist->queryTime;
 $dlist->Close();

src/dede/content_s_list.php → src/admin/content_s_list.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 专题列表
  *
  * @version        $Id: content_s_list.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/content_select_list.php → src/admin/content_select_list.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 选择文章
  *
  * @version        $Id: content_select_list.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/content_sg_list.php → src/admin/content_sg_list.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 单表模型列表
  *
  * @version        $Id: content_sg_list.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/content_tj.php → src/admin/content_tj.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 内容统计
  *
  * @version        $Id: content_tj.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/admin/css/frame.css

@@ -0,0 +1 @@
+*{padding:0;margin:0;box-sizing:border-box}a{text-decoration:none}html,body{width:100%;height:100%}body{height:100%;font-size:12px;overflow:hidden;z-index:1}body.showmenu{background:url(../images/leftmenu_bg.gif)-10px top repeat-y}body.hidemenu{background:none}ul{list-style:none}form{margin:0;padding:0}.head{width:100%;height:76px;overflow:hidden;z-index:8;position:relative}.top{height:46px;width:100%;background-image:linear-gradient(135deg,#008E38 0%,#639709 50%);overflow:hidden;clear:both}.top .top_logo{float:left;margin-left:30px;height:46px;line-height:46px}.top .top_logo a{font-size:18px;font-weight:600;color:#fff}.top .top_version{display:inline-block;margin-top:12px;margin-left:10px;color:#fff}.top .top_link{float:right;margin-right:30px}.top .top_link ul{float:left;line-height:46px;overflow:hidden}.top .top_link ul li.welcome img{margin-top:-2px;margin-right:10px;width:30px;height:30px;vertical-align:middle;border-radius:50%}.top .top_link ul li{float:left;color:#fff}.top .top_link ul li a{color:#fff;padding-left:20px}.top .top_link ul li a:hover{color:#ccc}.top .top_link .quick{padding:3px 0px 0px 0px;float:left}.top .top_link .quick a{display:block;color:#C60;float:left;line-height:21px;height:21px;overflow:hidden}.topnav{width:100%;height:30px;line-height:30px;background:#393d49;overflow:hidden;clear:both}.topnav .menuact{width:168px;float:left;padding-left:30px;overflow:hidden}.topnav .menuact a{overflow:hidden;color:#eee;padding-right:10px}.topnav .menuact a:hover{color:#fff}.nav{float:left;padding-left:2px;line-height:26px;color:#999}.nav ul li{float:left;display:block;margin-left:4px}.nav ul li a{padding:0 10px 0px 10px;color:#FFCC00}.nav ul li a:hover{color:#fff}.nav ul li a.thisclass,.nav ul li a.thisclass:hover{color:#4E8100;display:block;font-weight:bold;background:#fff;line-height:23px;border-top:2px solid #FFDE59;margin-top:4px;padding:0 10px 0px 10px}.sysmsg{padding-right:30px;float:right;width:500px;color:#999;overflow:hidden}.scroll{float:right;overflow:hidden}.scroll ul li,.sysmsg ul li a{color:#bbb}.scroll ul li a:hover{text-decoration:underline}.scroll a{padding-left:10px;color:#fff}body.showmenu .left{display:block}body.hidemenu .left{display:none}body.showmenu .right{left:220px}body.hidemenu .right{left:0}.left{position:absolute;top:76px;width:220px;left:0;bottom:0;z-index:7}.menu{height:100%}.top_link{font-size:12px}.menu iframe{height:100%;width:99.99%;z-index:20}.right{position:absolute;right:0;top:76px;bottom:0;z-index:7}.main{height:100%}.main iframe{height:100%;width:99.99%;z-index:20}.qucikmenu{position:absolute;right:10px;top:32px;z-index:9;display:none}.qucikmenu ul{width:110px;list-style:none;border:1px solid #E7E7E7;background:#fff}.qucikmenu ul li{display:block;text-align:left}.qucikmenu ul li a{height:30px;line-height:30px;display:block;color:#666;padding-left:10px;padding-right:10px}.qucikmenu ul li a:hover{background:#F7F7F7}.pagemask{width:100%;height:100%;background:#424b51;position:absolute;z-index:100;filter:alpha(opacity=70);-moz-opacity:.7;opacity:.7;display:none}.iframemask{position:absolute;z-index:80;top:0;left:0;background:#fff;border:none;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;height:100%;width:100%;display:none}.allmenu{margin-left:-400px;padding:10px;display:none;width:800px;position:absolute;top:76px;left:50%;z-index:999;background:#fff;border-radius:.2rem}.allmenu .allmenu-box{margin:0 auto;text-align:left;overflow:hidden;padding-left:2px}.maptop{float:left;width:130px;overflow:hidden;padding-right:6px;padding-left:6px;margin-left:-1px}.maptop dt.bigitem{padding:5px 10px;line-height:18px;color:#fff;background:#424b51}.mapitem dt{line-height:30px;font-weight:bold;text-indent:10px;background:#EFF1F1}.mapitem ul{margin-top:10px;margin-bottom:10px}.mapitem ul li{text-indent:20px;line-height:24px;background:url(../images/arrr.gif)0 8px no-repeat}.allmenu a{color:#5C604F}.allmenu a:hover{color:#F63}#login .theme{clear:both;padding:10px;width:70%;margin-top:20px}#login .theme li{margin-bottom:15px;margin-top:5px;overflow:hidden}#login .theme span{display:inline-block;float:left;width:150px;height:22px;line-height:22px;color:#424b51;text-align:right}input[type="text"],input[type="password"]{padding:2px 4px;width:140px;height:18px;line-height:18px;border-width:1px;border-style:solid;border-color:#fff;background:#fff;vertical-align:middle}input[type="text"]:focus,input[type="password"]:focus{box-shadow:none;outline:none}* html input.text{width:220px;border:1px solid #a7a6aa;background:#fff url(../images/input.gif)0 0 no-repeat;margin-top:-1px;margin-right:5px;margin-bottom:0;margin-left:2px;padding:3px;line-height:12px}* html input.radio{margin:-1px 0 0 -2px}.allsearch{float:left;margin-top:6px!important;font-size:12px;border:1px solid #fff;border-radius:.2rem}.np{margin-left:10px;width:40px;height:18px;font-size:12px;color:#fff;background:#57960f;border-radius:.2rem;border:none;cursor:pointer}

src/dede/dialog/config.php → src/admin/dialog/config.php

@@ -1,30 +1,24 @@
 <?php
-
 /**
- * 该页仅用于检测用户登录的情况，如要手工更改系统配置，请更改common.inc.php
+ * 该页仅用于检测用户登录的情况，如要手工修改系统配置，请修改common.inc.php
  *
  * @version        $Id: config.php 1 9:43 2010年7月8日Z tianya $
  * @package        DedeBIZ.Dialog
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
 require_once(dirname(__FILE__)."/../../include/common.inc.php");
 require_once(DEDEINC."/userlogin.class.php");
-
-//获得当前脚本名称，如果您的系统被禁用了$_SERVER变量，请自行更改这个选项
+//获得当前脚本名称，如果您的系统被禁用了$_SERVER变量，请自行修改这个选项
 $dedeNowurl   =  '';
 $s_scriptName = '';
 $isUrlOpen = @ini_get('allow_url_fopen');
-
 $dedeNowurl = GetCurUrl();
 $dedeNowurls = explode("?", $dedeNowurl);
 $s_scriptName = $dedeNowurls[0];
-
-
 //检验用户登录状态
 $cuserLogin = new userLogin();
-
 if ($cuserLogin->getUserID() <= 0) {
     if (empty($adminDirHand)) {
         ShowMsg("<b>提示：需输入后台管理目录才能登录</b><br /><form>请输入后台管理目录名：<input type='hidden' name='gotopage' value='".urlencode($dedeNowurl)."' /><input type='text' name='adminDirHand' value='dede' style='width:120px;' /><input style='width:80px;' type='submit' name='sbt' value='转入登录' /></form>", "javascript:;");

src/admin/dialog/select_images.php

@@ -0,0 +1,228 @@
+<?php
+/**
+ * 图片选择框
+ *
+ * @version        $Id: select_images.php 1 9:43 2010年7月8日Z tianya $
+ * @package        DedeBIZ.Dialog
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
+ * @license        https://www.dedebiz.com/license
+ * @link           https://www.dedebiz.com
+ */
+require_once(dirname(__FILE__)."/config.php");
+include(DEDEDATA.'/mark/inc_photowatermark_config.php');
+if (empty($activepath)) {
+    $activepath = '';
+}
+if (empty($imgstick)) {
+    $imgstick = '';
+}
+$noeditor = isset($noeditor) ? $noeditor : '';
+$activepath = str_replace('.', '', $activepath);
+$activepath = preg_replace("#\/{1,}#", '/', $activepath);
+if (strlen($activepath) < strlen($cfg_medias_dir)) {
+    $activepath = $cfg_medias_dir;
+}
+$inpath = $cfg_basedir.$activepath;
+$activeurl = '..'.$activepath;
+if (empty($f)) {
+    $f = 'form1.picname';
+}
+$f = RemoveXSS($f);
+if (empty($v)) {
+    $v = 'picview';
+}
+if (empty($comeback)) {
+    $comeback = '';
+}
+$addparm = '';
+if (!empty($CKEditor)) {
+    $addparm = '&CKEditor='.$CKEditor;
+    $f = $CKEditor;
+}
+if (!empty($CKEditorFuncNum)) {
+    $addparm .= '&CKEditorFuncNum='.$CKEditorFuncNum;
+}
+if (!empty($noeditor)) {
+    $addparm .= '&noeditor=yes';
+}
+?>
+<html>
+<head>
+    <meta charset="<?php echo $cfg_soft_lang; ?>">
+    <title>图片浏览器</title>
+    <link rel="stylesheet" href="../../static/css/bootstrap.min.css">
+    <link rel="stylesheet" href="../../static/font-awesome/css/font-awesome.min.css">
+    <link rel="stylesheet" href="../css/base.css">
+    <style>
+html{background:#f2f2f2}
+body{margin:0;line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
+a{text-decoration:none!important}
+table{background:#fff}
+.bg{margin:10px;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
+.linerow{border-bottom:1px solid #eee!important}
+.napisdiv{left:40;top:10;width:150px;height:100px;position:absolute;z-index:3;display:none}
+    </style>
+    <script>
+    function nullLink() {
+        return;
+    }
+    function ChangeImage(surl) {
+        document.getElementById('picview').src = surl;
+    }
+    </script>
+</head>
+<body class="bg">
+    <div id="floater" class="napisdiv">
+        <a href="javascript:nullLink();" onClick="document.getElementById('floater').style.display='none';"><img src="img/picviewnone.gif" id="picview" alt="关闭预览"></a>
+    </div>
+    <script src="../js/float.js"></script>
+    <script>
+    function nullLink() {
+        return;
+    }
+    function ChangeImage(surl) {
+        document.getElementById('floater').style.display = 'block';
+        document.getElementById('picview').src = surl;
+    }
+    function TNav() {
+        if (window.navigator.userAgent.indexOf("MSIE") >= 1) return 'IE';
+        else if (window.navigator.userAgent.indexOf("Firefox") >= 1) return 'FF';
+        else return "OT";
+    }
+    //获取地址参数
+    function getUrlParam(paramName) {
+        var reParam = new RegExp('(?:[\?&]|&amp;)' + paramName + '=([^&]+)', 'i');
+        var match = window.location.search.match(reParam);
+        return (match && match.length > 1) ? match[1] : '';
+    }
+    function ReturnImg(reimg) {
+        var funcNum = getUrlParam('CKEditorFuncNum');
+        if (funcNum > 1) {
+            var fileUrl = reimg;
+            window.opener.CKEDITOR.tools.callFunction(funcNum, fileUrl);
+        }
+        if (window.opener.document.<?php echo $f ?> != null) {
+            window.opener.document.<?php echo $f ?>.value = reimg;
+            if (window.opener.document.getElementById('div<?php echo $v ?>')) {
+                if (TNav() == 'IE') {
+                    //window.opener.document.getElementById('div<?php echo $v ?>').filters.item('DXImageTransform.Microsoft.AlphaImageLoader').src = reimg;
+                    window.opener.document.getElementById('div<?php echo $v ?>').src = reimg;
+                    window.opener.document.getElementById('div<?php echo $v ?>').style.width = '150px';
+                    window.opener.document.getElementById('div<?php echo $v ?>').style.height = '100px';
+                } else
+                    window.opener.document.getElementById('div<?php echo $v ?>').style.backgroundImage = "url(" + reimg + ")";
+                } else if (window.opener.document.getElementById('<?php echo $v ?>')) {
+                window.opener.document.getElementById('<?php echo $v ?>').src = reimg;
+            }
+            //适配新的缩略图
+            if (window.opener.document.getElementById('litPic')) {
+                window.opener.document.getElementById('litPic').src = reimg;
+            }
+            if (document.all) window.opener = true;
+        }
+        window.close();
+    }
+    </script>
+    <table width="100%" border="0" cellpadding="0" cellspacing="1" align="center" class="table table-borderless">
+        <tr>
+            <td colspan="4" height="30">
+                <form action="select_images_post.php" method="POST" enctype="multipart/form-data" name="myform">
+                    <?php $noeditor = !empty($noeditor) ? "<input type='hidden' name='noeditor' value='yes'>" : ''; echo $noeditor; ?>
+                    <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
+                    <input type="hidden" name="f" value="<?php echo $f ?>">
+                    <input type="hidden" name="v" value="<?php echo $v ?>">
+                    <input type="hidden" name="imgstick" value="<?php echo $imgstick ?>">
+                    <input type="hidden" name="CKEditorFuncNum" value="<?php echo isset($CKEditorFuncNum) ? $CKEditorFuncNum : 1; ?>">
+                    <input type="hidden" name="job" value="upload">
+                    上传：<input type="file" name="imgfile" style="width:160px;border:none">
+                    <label><input type="checkbox" name="needwatermark" value="1" class="np" <?php if ($photo_markup == '1') echo "checked"; ?> /> 水印 </label>
+                    <label><input type="checkbox" name="resize" value="1" class="np"> 缩小 </label>
+                    宽：<input type="text" name="iwidth" value="<?php echo $cfg_ddimg_width ?>" style="width:46px">
+                    高：<input type="text" name="iheight" value="<?php echo $cfg_ddimg_height ?>" style="width:46px">
+                    <button type="submit" name="sb1" class="btn btn-success btn-sm">确定</button>
+                </form>
+            </td>
+        </tr>
+        <tr>
+            <td width="10%" class="linerow">预览</td>
+            <td width="40%" class="linerow">选择图片</td>
+            <td width="20%" class="linerow">文件大小</td>
+            <td width="30%" class="linerow">修改时间</td>
+        </tr>
+        <tr>
+            <td class="linerow" colspan="4">点击图片预览，点击图片名选择图片，显示图片后点击该图片关闭预览。</td>
+        </tr>
+        <?php
+        $dh = dir($inpath);
+        $ty1 = "";
+        $ty2 = "";
+        while ($file = $dh->read()) {
+            //计算文件大小和创建时间
+            if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) {
+                $filesize = filesize("$inpath/$file");
+                $filesize = $filesize / 1024;
+                if ($filesize != "")
+                    if ($filesize < 0.1) {
+                        @list($ty1, $ty2) = split("\.", $filesize);
+                        $filesize = $ty1.".".substr($ty2, 0, 2);
+                    } else {
+                        @list($ty1, $ty2) = split("\.", $filesize);
+                        $filesize = $ty1.".".substr($ty2, 0, 1);
+                    }
+                $filetime = filemtime("$inpath/$file");
+                $filetime = MyDate("Y-m-d H:i", $filetime);
+            }
+            if ($file == ".") continue;
+            else if ($file == "..") {
+                if ($activepath == "") continue;
+                $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath);
+                $line = "<tr>
+                <td class='linerow' colspan='2'>
+                <a href='select_images.php?imgstick=$imgstick&v=$v&f=$f&activepath=".urlencode($tmp).$addparm."'><img src='img/dir2.gif'>上级目录</a></td>
+                <td colspan='2' class='linerow'>当前目录:$activepath</td>
+                </tr>";
+                echo $line;
+            } else if (is_dir("$inpath/$file")) {
+                if (preg_match("#^_(.*)$#i", $file)) continue;
+                if (preg_match("#^\.(.*)$#i", $file)) continue;
+                $line = "<tr>
+                <td class='linerow' colspan='2'>
+                <a href='select_images.php?imgstick=$imgstick&v=$v&f=$f&activepath=".urlencode("$activepath/$file").$addparm."'><img src='img/dir.gif'>$file</a></td>
+                <td class='linerow'></td>
+                <td class='linerow'></td>
+                </tr>";
+                echo "$line";
+            } else if (preg_match("#\.(".$cfg_imgtype.")#i", $file)) {
+                $reurl = "$activeurl/$file";
+                $reurl = preg_replace("#^\.\.#", "", $reurl);
+                $reurl = $reurl;
+                if ($file == $comeback) $lstyle = " style='color:red' ";
+                else  $lstyle = "";
+                $line = "<tr>
+                <td class='linerow'><a href=\"#\" onClick=\"ChangeImage('$reurl');\"><img src='img/picviewnone.gif'></a></td>
+                <td class='linerow'><a href=# onclick=\"ReturnImg('$reurl');\" $lstyle><img src='img/gif.gif'>$file</a></td>
+                <td class='linerow'>$filesize KB</td>
+                <td class='linerow'>$filetime</td>
+                </tr>";
+                echo "$line";
+            } else if (preg_match("#\.(jpg)#i", $file)) {
+                $reurl = "$activeurl/$file";
+                $reurl = preg_replace("#^\.\.#", "", $reurl);
+                $reurl = $reurl;
+                if ($file == $comeback) $lstyle = " style='color:red' ";
+                else  $lstyle = "";
+                $line = "<tr>
+                <td class='linerow'><a href=\"#\" onClick=\"ChangeImage('$reurl');\"><img src='img/picviewnone.gif'></a></td>
+                <td class='linerow'><a href=# onclick=\"ReturnImg('$reurl');\" $lstyle><img src='img/jpg.gif'>$file</a></td>
+                <td class='linerow'>$filesize KB</td>
+                <td class='linerow'>$filetime</td>
+                </tr>";
+                echo "$line";
+            }
+        }//End Loop
+        $dh->close();
+        ?>
+        </tr>
+    </table>
+</body>
+</html>

src/dede/dialog/select_images_post.php → src/admin/dialog/select_images_post.php

@@ -1,18 +1,15 @@
 <?php
-
 /**
  * 图片选择
  *
  * @version        $Id: select_images_post.php 1 9:43 2010年7月8日Z tianya $
  * @package        DedeBIZ.Dialog
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @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."/image.func.php");
-
-
 if (empty($activepath)) {
     $activepath = '';
     $activepath = str_replace('.', '', $activepath);
@@ -21,20 +18,18 @@ if (empty($activepath)) {
         $activepath = $cfg_image_dir;
     }
 }
-
-
 if (empty($imgfile)) {
     $imgfile = '';
 }
 if (!is_uploaded_file($imgfile)) {
-    ShowMsg("您没有选择上传的文件!".$imgfile, "-1");
+    ShowMsg("您没有选择上传的文件".$imgfile, "-1");
     exit();
 }
 $CKEditorFuncNum = (isset($CKEditorFuncNum)) ? $CKEditorFuncNum : 1;
 $imgfile_name = trim(preg_replace("#[ \r\n\t\*\%\\\/\?><\|\":]{1,}#", '', $imgfile_name));
 
 if (!preg_match("#\.(".$cfg_imgtype.")#i", $imgfile_name)) {
-    ShowMsg("您所上传的图片类型不在许可列表，请更改系统对扩展名限定的配置", "-1");
+    ShowMsg("您所上传的图片类型不在许可列表，请修改系统对扩展名限定的配置", "-1");
     exit();
 }
 $nowtme = time();
@@ -56,7 +51,6 @@ $filename = $filename.'.'.$fs[count($fs) - 1];
 $filename_name = $filename_name.'.'.$fs[count($fs) - 1];
 $fullfilename = $cfg_basedir.$activepath."/".$filename;
 move_uploaded_file($imgfile, $fullfilename) or die("上传文件到 $fullfilename 失败");
-
 @unlink($imgfile);
 if (empty($resize)) {
     $resize = 0;
@@ -70,7 +64,6 @@ if ($resize == 1) {
         WaterImg($fullfilename, 'up');
     }
 }
-
 $info = '';
 $sizes[0] = 0;
 $sizes[1] = 0;
@@ -79,7 +72,7 @@ $imgwidthValue = $sizes[0];
 $imgheightValue = $sizes[1];
 $imgsize = filesize($fullfilename);
 $inquery = "INSERT INTO `#@__uploads`(arcid,title,url,mediatype,width,height,playtime,filesize,uptime,mid)
-  VALUES ('0','$filename','".$activepath."/".$filename."','1','$imgwidthValue','$imgheightValue','0','{$imgsize}','{$nowtme}','".$cuserLogin->getUserID()."'); ";
+    VALUES ('0','$filename','".$activepath."/".$filename."','1','$imgwidthValue','$imgheightValue','0','{$imgsize}','{$nowtme}','".$cuserLogin->getUserID()."'); ";
 $dsql->ExecuteNoneQuery($inquery);
 $fid = $dsql->GetLastID();
 AddMyAddon($fid, $activepath.'/'.$filename);
@@ -90,8 +83,6 @@ if ($GLOBALS['cfg_html_editor'] == 'ckeditor' && $CKUpload) {
     echo json_encode($result);
     exit;
 }
-
-
 if (!empty($noeditor)) {
     ShowMsg("成功上传一幅图片", "select_images.php?imgstick=$imgstick&comeback=".urlencode($filename_name)."&v=$v&f=$f&CKEditorFuncNum=$CKEditorFuncNum&noeditor=yes&activepath=".urlencode($activepath)."/$mdir&d=".time());
 } else {

src/admin/dialog/select_media.php

@@ -0,0 +1,187 @@
+<?php
+/**
+ * 多媒体选择框
+ *
+ * @version        $Id: select_media.php 1 9:43 2010年7月8日Z tianya $
+ * @package        DedeBIZ.Dialog
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
+ * @license        https://www.dedebiz.com/license
+ * @link           https://www.dedebiz.com
+ */
+require_once(dirname(__FILE__)."/config.php");
+if (empty($activepath)) {
+    $activepath = '';
+}
+$noeditor = isset($noeditor) ? $noeditor : '';
+$activepath = str_replace('.', '', $activepath);
+$activepath = preg_replace("#\/{1,}#", '/', $activepath);
+if (strlen($activepath) < strlen($cfg_other_medias)) {
+    $activepath = $cfg_other_medias;
+}
+$inpath = $cfg_basedir.$activepath;
+$activeurl = '..'.$activepath;
+if (!is_dir($inpath)) {
+    die('No Exsits Path');
+}
+if (empty($f)) {
+    $f = 'form1.enclosure';
+}
+
+if (empty($comeback)) {
+    $comeback = '';
+}
+$addparm = '';
+if (!empty($CKEditor)) {
+    $addparm = '&CKEditor='.$CKEditor;
+}
+if (!empty($CKEditorFuncNum)) {
+    $addparm .= '&CKEditorFuncNum='.$CKEditorFuncNum;
+}
+if (!empty($noeditor)) {
+    $addparm .= '&noeditor=yes';
+}
+?>
+<html>
+<head>
+    <meta http-equiv='Content-Type' content='text/html; charset=<?php echo $cfg_soft_lang; ?>'>
+    <title>媒体文件管理器</title>
+    <link rel="stylesheet" href="../../static/css/bootstrap.min.css">
+    <link rel="stylesheet" href="../../static/font-awesome/css/font-awesome.min.css">
+    <link rel="stylesheet" href="../css/base.css">
+    <style>
+html{background:#f2f2f2}
+body{margin:0;line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}
+a{text-decoration:none!important}
+table{background:#fff}
+.bg{margin:10px;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}
+.linerow{border-bottom:1px solid #eee!important}
+    </style>
+</head>
+<body class="bg">
+    <script>
+    function nullLink() {
+        return;
+    }
+    function ReturnValue(reimg) {
+        if (window.opener.document.<?php echo $f ?> != null) {
+            window.opener.document.<?php echo $f ?>.value = reimg;
+        }
+        var funcNum = <?php echo isset($CKEditorFuncNum) ? $CKEditorFuncNum : 1; ?>;
+        if (window.opener.CKEDITOR != null && funcNum != 1) {
+            window.opener.CKEDITOR.tools.callFunction(funcNum, reimg);
+        }
+        window.close();
+    }
+    </script>
+    <table width="100%" border="0" align="center" cellspacing="0" cellpadding="2" class="table table-borderless">
+        <tr>
+            <td colspan="3" height="30">
+                <form action="select_media_post.php" method="POST" enctype="multipart/form-data" name="myform">
+                    <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
+                    <input type="hidden" name="f" value="<?php echo $f ?>">
+                    <input type="hidden" name="job" value="upload">
+                    <input type="hidden" name="CKEditorFuncNum" value="<?php echo isset($CKEditorFuncNum) ? $CKEditorFuncNum : 1; ?>">
+                    上传：<input type="file" name="uploadfile" style="width:160px;border:none">
+                    <button type="submit" name="sb1" class="btn btn-success btn-sm">确定</button>
+                </form>
+            </td>
+        </tr>
+        <tr>
+            <td width="55%" align="center" class="linerow">点击名称选择文件</td>
+            <td width="15%" align="center" class="linerow">文件大小</td>
+            <td width="30%" align="center" class="linerow">最后修改时间</td>
+        </tr>
+        <?php
+        $dh = dir($inpath);
+        $ty1 = "";
+        $ty2 = "";
+        while ($file = $dh->read()) {
+            //计算文件大小和创建时间
+            if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) {
+                $filesize = filesize("$inpath/$file");
+                $filesize = $filesize / 1024;
+                if ($filesize != "")
+                    if ($filesize < 0.1) {
+                        @list($ty1, $ty2) = split("\.", $filesize);
+                        $filesize = $ty1.".".substr($ty2, 0, 2);
+                    } else {
+                        @list($ty1, $ty2) = split("\.", $filesize);
+                        $filesize = $ty1.".".substr($ty2, 0, 1);
+                    }
+                $filetime = filemtime("$inpath/$file");
+                $filetime = MyDate("Y-m-d H:i", $filetime);
+            }
+            //判断文件类型并作处理
+            if ($file == ".") continue;
+            else if ($file == "..") {
+                if ($activepath == "") continue;
+                $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath);
+                $line = "<tr>
+                <td class='linerow'><a href='select_media.php?f=$f&activepath=".urlencode($tmp).$addparm."'><img src='img/dir2.gif'>上级目录</a></td>
+                <td colspan='2' class='linerow'>当前目录：$activepath</td>
+                </tr>";
+                echo $line;
+            } else if (is_dir("$inpath/$file")) {
+                if (preg_match("#^_(.*)$#i", $file)) continue;
+                if (preg_match("#^\.(.*)$#i", $file)) continue;
+                $line = "<tr>
+                <td class='linerow'><a href=select_media.php?f=$f&activepath=".urlencode("$activepath/$file").$addparm."><img src='img/dir.gif'>$file</a></td>
+                <td class='linerow'></td>
+                <td class='linerow'></td>
+                </tr>";
+                echo "$line";
+            } else if (preg_match("#\.(swf|fly|fla|flv)#i", $file)) {
+                $reurl = "$activeurl/$file";
+                $reurl = preg_replace("#^\.\.#", "", $reurl);
+                $reurl = $reurl;
+                if ($file == $comeback) $lstyle = " style='color:red' ";
+                else  $lstyle = "";
+                $line = "<tr>
+                <td class='linerow'><a href=\"javascript:ReturnValue('$reurl');\"><img src='img/flash.gif'>$file</a></td>
+                <td class='linerow'>$filesize KB</td>
+                <td align='center' class='linerow'>$filetime</td>
+                </tr>";
+                echo "$line";
+            } else if (preg_match("#\.(wmv|avi)#i", $file)) {
+                $reurl = "$activeurl/$file";
+                $reurl = preg_replace("#^\.\.#", "", $reurl);
+                $reurl = $reurl;
+                if ($file == $comeback) $lstyle = " style='color:red' ";
+                else  $lstyle = "";
+                $line = "<tr>
+                <td class='linerow'><a href=\"javascript:ReturnValue('$reurl');\"><img src='img/wmv.gif'>$file</a></td>
+                <td class='linerow'>$filesize KB</td>
+                <td class='linerow' align='center'>$filetime</td>
+                </tr>";
+                echo "$line";
+            } else if (preg_match("#\.(rm|rmvb)#i", $file)) {
+                $reurl = "$activeurl/$file";
+                $reurl = preg_replace("#^\.\.#", "", $reurl);
+                $reurl = $reurl;
+                if ($file == $comeback) $lstyle = " style='color:red' ";
+                else  $lstyle = "";
+                $line = "<tr>
+                <td class='linerow'><a href=\"javascript:ReturnValue('$reurl');\"><img src='img/rm.gif'>$file</a></td>
+                <td class='linerow'>$filesize KB</td>
+                <td class='linerow' align='center'>$filetime</td>
+                </tr>";
+                echo "$line";
+            } else if (preg_match("#\.(mp3|wma)#", $file)) {
+                $reurl = "$activeurl/$file";
+                $reurl = preg_replace("#^\.\.#", "", $reurl);
+                $reurl = $reurl;
+                if ($file == $comeback) $lstyle = " style='color:red' ";
+                else  $lstyle = "";
+                $line = "<tr>
+                <td class='linerow'><a href=\"javascript:ReturnValue('$reurl');\"><img src='img/mp3.gif'>$file</a></td>
+                <td class='linerow'>$filesize KB</td>
+                <td class='linerow' align='center'>$filetime</td>
+                </tr>";
+                echo "$line";
+            }
+        }//End Loop
+        $dh->close();
+        ?>
+    </table>
+</body>
+</html>

src/dede/dialog/select_media_post.php → src/admin/dialog/select_media_post.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 多媒体发送
  *
  * @version        $Id: select_media_post.php 1 9:43 2010年7月8日Z tianya $
  * @package        DedeBIZ.Dialog
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -23,5 +22,4 @@ if (empty($activepath)) {
         $activepath = $cfg_other_medias;
     }
 }
-
 require_once(dirname(__FILE__)."/select_soft_post.php");

src/dede/dialog/select_soft.php → src/admin/dialog/select_soft.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: select_soft.php 1 9:43 2010年7月8日Z tianya $
  * @package        DedeBIZ.Dialog
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -82,10 +82,8 @@ table{background:#fff}
                     <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
                     <input type="hidden" name="f" value="<?php echo $f ?>">
                     <input type="hidden" name="job" value="upload">
-                    &nbsp;上传：<input type="file" name="uploadfile" size="24" style="border:none">
-                    &nbsp;
+                    上传：<input type="file" name="uploadfile" size="24" style="border:none">
                     改名：<input type="text" name="newname" style="width:160px">
-                    &nbsp;
                     <button type="submit" name="sb1" class="btn btn-success btn-sm">确定</button>
                 </form>
             </td>
@@ -93,9 +91,9 @@ table{background:#fff}
         <tr>
             <td colspan="3">
                 <table width="100%" border="0" cellspacing="0" cellpadding="2">
-                    <tr height="28">
-                        <td width="50%" class="linerow">选择文件</td>
-                        <td width="20%" class="linerow">文件大小</td>
+                    <tr height="26">
+                        <td width="45%" class="linerow">选择文件</td>
+                        <td width="25%" class="linerow">文件大小</td>
                         <td width="30%" class="linerow">修改时间</td>
                     </tr>
                     <?php
@@ -122,15 +120,15 @@ table{background:#fff}
                         else if ($file == "..") {
                             if ($activepath == "") continue;
                             $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath);
-                            $line = "\n<tr height='26'>
+                            $line = "<tr height='26'>
                             <td class='linerow'><a href='select_soft.php?f=$f&activepath=".urlencode($tmp).$addparm."'><img src='img/dir2.gif'>上级目录</a></td>
-                            <td colspan='2' class='linerow'>当前目录:$activepath</td>
+                            <td colspan='2' class='linerow'>当前目录：$activepath</td>
                             </tr>\r\n";
                             echo $line;
                         } else if (is_dir("$inpath/$file")) {
                             if (preg_match("#^_(.*)$#i", $file)) continue;
                             if (preg_match("#^\.(.*)$#i", $file)) continue;
-                            $line = "\n<tr height='26'>
+                            $line = "<tr height='26'>
                             <td class='linerow'><a href=select_soft.php?f=$f&activepath=".urlencode("$activepath/$file").$addparm."><img src='img/dir.gif'>$file</a></td>
                             <td class='linerow'></td>
                             <td class='linerow'></td>
@@ -142,7 +140,7 @@ table{background:#fff}
                             $reurl = "$activeurl/$file";
                             $reurl = preg_replace("#^\.\.#", "", $reurl);
                             $reurl = $reurl;
-                            $line = "\n<tr height='26'>
+                            $line = "<tr height='26'>
                             <td class='linerow'><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='img/zip.gif'>$file</a></td>
                             <td class='linerow'>$filesize KB</td>
                             <td class='linerow'>$filetime</td>
@@ -154,7 +152,7 @@ table{background:#fff}
                             $reurl = "$activeurl/$file";
                             $reurl = preg_replace("#^\.\.#", "", $reurl);
                             $reurl = $reurl;
-                            $line = "\n<tr height='26'>
+                            $line = "<tr height='26'>
                             <td class='linerow'><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='img/exe.gif'>$file</a></td>
                             <td class='linerow'>$filesize KB</td>
                             <td class='linerow'>$filetime</td>
@@ -168,7 +166,7 @@ table{background:#fff}
             </td>
         </tr>
         <tr>
-            <td colspan="3" height="30">点击选择的文件，红色字样的为刚上传的文件</td>
+            <td colspan="3" height="30">点击选择的文件，红色字样的为刚上传的文件。</td>
         </tr>
     </table>
 </body>

src/dede/dialog/select_soft_post.php → src/admin/dialog/select_soft_post.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 软件发送
  *
  * @version        $Id: select_soft_post.php 1 9:43 2010年7月8日Z tianya $
  * @package        DedeBIZ.Dialog
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -17,25 +16,20 @@ if (empty($uploadmbtype)) $uploadmbtype = '软件类型';
 if (empty($bkurl)) $bkurl = 'select_soft.php';
 $CKEditorFuncNum = (isset($CKEditorFuncNum)) ? $CKEditorFuncNum : 1;
 $newname = (empty($newname) ? '' : preg_replace("#[\\ \"\*\?\t\r\n<>':\/|]#", "", $newname));
-
 $uploadfile = isset($imgfile) && empty($uploadfile) ? $imgfile : $uploadfile;
 $uploadfile_name = isset($imgfile_name) && empty($uploadfile_name) ? $imgfile_name : $uploadfile_name;
-
 if (!is_uploaded_file($uploadfile)) {
     ShowMsg("您没有选择上传的文件或选择的文件大小超出限制!", "-1");
     exit();
 }
-
 //软件类型所有支持的附件
 $cfg_softtype = $cfg_softtype;
-
 $cfg_softtype = str_replace('||', '|', $cfg_softtype);
 $uploadfile_name = trim(preg_replace("#[ \r\n\t\*\%\\\/\?><\|\":]{1,}#", '', $uploadfile_name));
 if (!preg_match("#\.(".$cfg_softtype.")#i", $uploadfile_name)) {
-    ShowMsg("您所上传的{$uploadmbtype}不在许可列表，请更改系统对扩展名限定的配置", "");
+    ShowMsg("您所上传的{$uploadmbtype}不在许可列表，请修改系统对扩展名限定的配置", "-1");
     exit();
 }
-
 $nowtme = time();
 if ($activepath == $cfg_soft_dir) {
     $newdir = MyDate($cfg_addon_savetype, $nowtme);
@@ -45,7 +39,6 @@ if ($activepath == $cfg_soft_dir) {
         CloseFtp();
     }
 }
-
 //文件名（前为手工指定， 后者自动处理）
 if (!empty($newname)) {
     $filename = $newname;
@@ -60,17 +53,15 @@ if (!empty($newname)) {
     $filename = $cuserLogin->getUserID().'-'.dd2char(MyDate('ymdHis', $nowtme));
     $fs = explode('.', $uploadfile_name);
     if (preg_match("#".$cfg_not_allowall."#", $fs[count($fs) - 1])) {
-        ShowMsg("您上传了某些可能存在不安全因素的文件，系统拒绝操作", 'javascript:;');
+        ShowMsg("您上传了某些可能存在不安全因素的文件，系统拒绝操作", "-1");
         exit();
     }
     $filename = $filename.'.'.$fs[count($fs) - 1];
 }
-
 $fullfilename = $cfg_basedir.$activepath.'/'.$filename;
 $fullfileurl = $activepath.'/'.$filename;
 move_uploaded_file($uploadfile, $fullfilename) or die("上传文件到 $fullfilename 失败");
 @unlink($uploadfile);
-
 if ($uploadfile_type == 'application/x-shockwave-flash') {
     $mediatype = 2;
 } else if (preg_match('#image#i', $uploadfile_type)) {
@@ -80,15 +71,11 @@ if ($uploadfile_type == 'application/x-shockwave-flash') {
 } else {
     $mediatype = 4;
 }
-
-
 $inquery = "INSERT INTO `#@__uploads`(arcid,title,url,mediatype,width,height,playtime,filesize,uptime,mid)
    VALUES ('0','$filename','$fullfileurl','$mediatype','0','0','0','{$uploadfile_size}','{$nowtme}','".$cuserLogin->getUserID()."'); ";
-
 $dsql->ExecuteNoneQuery($inquery);
 $fid = $dsql->GetLastID();
 AddMyAddon($fid, $fullfileurl);
-
 if ($ck == 1) {
     $funcNum = isset($_GET['CKEditorFuncNum']) ? $_GET['CKEditorFuncNum'] : 1;
     $url = $fullfileurl;

src/dede/dialog/select_templets.php → src/admin/dialog/select_templets.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: select_templets.php 1 9:43 2010年7月8日Z tianya $
  * @package        DedeBIZ.Dialog
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -59,6 +59,18 @@ table{background:#fff}
     }
     </script>
     <table width="100%" border="0" cellpadding="0" cellspacing="1" align="center" class="table table-borderless">
+        <tr>
+            <td colspan="3" height="30">
+                <form action="select_templets_post.php" method="POST" enctype="multipart/form-data" name="myform">
+                    <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
+                    <input type="hidden" name="f" value="<?php echo $f ?>">
+                    <input type="hidden" name="job" value="upload">
+                    上传：<input type="file" name="uploadfile" style="width:260px;border:none">
+                    改名：<input type="text" name="filename" style="width:160px">
+                    <button type="submit" name="sb1" class="btn btn-success btn-sm">确定</button>
+                </form>
+            </td>
+        </tr>
         <tr>
             <td width="50%" class="linerow">选择文件</td>
             <td width="20%" class="linerow">文件大小</td>
@@ -89,7 +101,7 @@ table{background:#fff}
                 else if ($file == "..") {
                     if ($activepath == "") continue;
                     $tmp = preg_replace("#[\/][^\/]*$#", "", $activepath);
-                    $line = "\n<tr>
+                    $line = "<tr>
                     <td class='linerow'><a href='select_templets.php?f=$f&activepath=".urlencode($tmp)."'><img src='img/dir2.gif'>上级目录</a></td>
                     <td colspan='2' class='linerow'>当前目录:$activepath</td>
                     </tr>\r\n";
@@ -97,7 +109,7 @@ table{background:#fff}
                 } else if (is_dir("$inpath/$file")) {
                     if (preg_match("#^_(.*)$#i", $file)) continue;
                     if (preg_match("#^\.(.*)$#i", $file)) continue;
-                    $line = "\n<tr>
+                    $line = "<tr>
                     <td class='linerow'><a href=select_templets.php?f=$f&activepath=".urlencode("$activepath/$file")."><img src='img/dir.gif'>$file</a></td>
                     <td class='linerow'></td>
                     <td class='linerow'></td>
@@ -109,7 +121,7 @@ table{background:#fff}
                     $reurl = "$activeurl/$file";
                     $reurl = preg_replace("#\.\.#", "", $reurl);
                     $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
-                    $line = "\n<tr>
+                    $line = "<tr>
                     <td class='linerow'><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='img/htm.gif'>$file</a></td>
                     <td class='linerow'>$filesize KB</td>
                     <td class='linerow'>$filetime</td>
@@ -121,7 +133,7 @@ table{background:#fff}
                     $reurl = "$activeurl/$file";
                     $reurl = preg_replace("#\.\.#", "", $reurl);
                     $reurl = preg_replace("#".$templetdir."/#", "", $reurl);
-                    $line = "\n<tr>
+                    $line = "<tr>
                     <td class='linerow'><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='img/css.gif'>$file</a></td>
                     <td class='linerow'>$filesize KB</td>
                     <td class='linerow'>$filetime</td>
@@ -133,7 +145,7 @@ table{background:#fff}
                     $reurl = "$activeurl/$file";
                     $reurl = preg_replace("#\.\.#", "", $reurl);
                     $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
-                    $line = "\n<tr>
+                    $line = "<tr>
                     <td class='linerow'><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='img/js.gif'>$file</a></td>
                     <td class='linerow'>$filesize KB</td>
                     <td class='linerow'>$filetime</td>
@@ -145,7 +157,7 @@ table{background:#fff}
                     $reurl = "$activeurl/$file";
                     $reurl = preg_replace("#\.\.#", "", $reurl);
                     $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
-                    $line = "\n<tr>
+                    $line = "<tr>
                     <td class='linerow'><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='img/jpg.gif'>$file</a></td>
                     <td class='linerow'>$filesize KB</td>
                     <td class='linerow'>$filetime</td>
@@ -157,7 +169,7 @@ table{background:#fff}
                     $reurl = "$activeurl/$file";
                     $reurl = preg_replace("#\.\.#", "", $reurl);
                     $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
-                    $line = "\n<tr>
+                    $line = "<tr>
                     <td class='linerow'><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='img/gif.gif'>$file</a></td>
                     <td class='linerow'>$filesize KB</td>
                     <td class='linerow'>$filetime</td>
@@ -169,7 +181,7 @@ table{background:#fff}
                     $reurl = "$activeurl/$file";
                     $reurl = preg_replace("#\.\.#", "", $reurl);
                     $reurl = preg_replace("#".$templetdir."\/#", "", $reurl);
-                    $line = "\n<tr>
+                    $line = "<tr>
                     <td class='linerow'><a href=\"javascript:ReturnValue('$reurl');\" $lstyle><img src='img/txt.gif'>$file</a></td>
                     <td class='linerow'>$filesize KB</td>
                     <td class='linerow'>$filetime</td></tr>";
@@ -178,24 +190,6 @@ table{background:#fff}
             }//End Loop
             $dh->close();
             ?>
-            <tr>
-                <td colspan="3">
-                    <table width="100%">
-                        <form action="select_templets_post.php" method="POST" enctype="multipart/form-data" name="myform">
-                        <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
-                        <input type="hidden" name="f" value="<?php echo $f ?>">
-                        <input type="hidden" name="job" value="upload">
-                            <tr>
-                                <td>
-                                    上传：<input type="file" name="uploadfile" style="width:260px;border:none">
-                                    改名：<input type="text" name="filename" style="width:160px">
-                                    <button type="submit" name="sb1" class="btn btn-success btn-sm">确定</button>
-                                </td>
-                            </tr>
-                        </form>
-                    </table>
-                </td>
-            </tr>
         </table>
     </body>
 </html>

src/dede/dialog/select_templets_post.php → src/admin/dialog/select_templets_post.php

@@ -1,15 +1,13 @@
 <?php
-
 /**
  * 模板发送
  *
  * @version        $Id: select_templets_post.php 1 9:43 2010年7月8日Z tianya $
  * @package        DedeBIZ.Dialog
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-
 require_once(dirname(__FILE__)."/config.php");
 $cfg_txttype = "htm|html|tpl|txt";
 if (empty($uploadfile)) {

src/dede/diy_add.php → src/admin/diy_add.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 增加自定义表单
  *
  * @version        $Id: diy_add.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -21,7 +20,7 @@ if (empty($action)) {
     include(DEDEADMIN."/templets/diy_add.htm");
 } else {
     if (preg_match("#[^0-9-]#", $diyid) || empty($diyid)) {
-        ShowMsg("<font color=red>'自定义表单diyid'</font>必须为数字", "-1");
+        ShowMsg("<span style='color:#e74d58'>'自定义表单diyid'</span>必须为数字", "-1");
         exit();
     }
     if ($table == "") {

src/dede/diy_edit.php → src/admin/diy_edit.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 编辑自定义表单
  *
  * @version        $Id: diy_add.php 1 14:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -25,7 +24,7 @@ if ($dopost == "save") {
     $name = dede_htmlspecialchars($name);
     $query = "UPDATE `#@__diyforms` SET name = '$name', listtemplate='$listtemplate', viewtemplate='$viewtemplate', posttemplate='$posttemplate', public='$public' WHERE diyid='$diyid' ";
     $dsql->ExecuteNoneQuery($query);
-    ShowMsg("成功更改一个自定义表单", "diy_main.php");
+    ShowMsg("成功修改一个自定义表单", "diy_main.php");
     exit();
 }
 /*----------------

src/dede/diy_field_add.php → src/admin/diy_field_add.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 增加自定义表单字段
  *
  * @version        $Id: diy_field_add.php 1 18:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */

src/dede/diy_field_edit.php → src/admin/diy_field_edit.php

@@ -1,11 +1,10 @@
 <?php
-
 /**
  * 编辑自定义表单字段
  *
  * @version        $Id: diy_field_edit.php 1 18:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
@@ -38,7 +37,7 @@ foreach ($ds as $d) {
     $fieldtypes[$dds[0]] = $dds[1];
 }
 
-//保存更改
+//保存修改
 /*--------------------
 function _SAVE()
 ----------------------*/
@@ -101,7 +100,7 @@ if ($action == 'save') {
     $oksetting = $dtp->GetResultNP();
     $oksetting = addslashes($oksetting);
     $dsql->ExecuteNoneQuery("UPDATE #@__diyforms SET info='$oksetting' WHERE diyid='$diyid' ");
-    ShowMsg("成功更改一个字段的配置", "diy_edit.php?diyid={$diyid}");
+    ShowMsg("成功修改一个字段的配置", "diy_edit.php?diyid={$diyid}");
     exit();
 }
 /*------------------

src/dede/diy_list.php → src/admin/diy_list.php

@@ -4,7 +4,7 @@
  *
  * @version        $Id: diy_list.php 1 18:31 2010年7月12日Z tianya $
  * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2021, DedeBIZ.COM
+ * @copyright      Copyright (c) 2022, DedeBIZ.COM
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */