对话框，文件上传，模块上传，模型导入导出等等调整

src/admin/album_add.php

@@ -233,7 +233,7 @@ if ($dopost != 'save') {
     $wecome_info = "文档管理 - 发布图片文档";
     $win = new OxWindow();
     $win->AddTitle("成功发布图片文档");
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", FALSE);
     $win->Display();
 }

src/admin/album_edit.php

@@ -274,7 +274,7 @@ if ($dopost != 'save') {
     $wecome_info = "文档管理 - 修改图片文档";
     $win = new OxWindow();
     $win->AddTitle("成功修改图片文档");
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display();
 }

src/admin/archives_add.php

@@ -179,7 +179,7 @@ if ($dopost != 'save') {
     $wecome_info = "文档管理 - 发布自定义文档";
     $win = new OxWindow();
     $win->AddTitle("成功发布自定义文档：");
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display();
 }

src/admin/archives_edit.php

@@ -163,7 +163,7 @@ if ($dopost != 'save') {
     $wecome_info = "文档管理 - 修改自定义文档";
     $win = new OxWindow();
     $win->AddTitle("成功修改自定义文档");
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display();
 }

src/admin/archives_sg_add.php

@@ -133,7 +133,7 @@ if ($dopost != 'save') {
     $wecome_info = "文档管理 - 发布分类文档";
     $win = new OxWindow();
     $win->AddTitle("成功发布分类文档");
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display();
 }

src/admin/archives_sg_edit.php

@@ -116,7 +116,7 @@ if ($dopost != 'save') {
     $wecome_info = "文档管理 - 修改分类文档";
     $win = new OxWindow();
     $win->AddTitle("成功修改分类文档");
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display();
 }

src/admin/article_add.php

@@ -206,7 +206,7 @@ if ($dopost != 'save') {
     $wecome_info = "文档管理 - 发布文档";
     $win = new OxWindow();
     $win->AddTitle("成功发布文档");
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display();
 }

src/admin/article_edit.php

@@ -177,7 +177,7 @@ if ($dopost != 'save') {
     $wecome_info = "文档管理 - 修改文档";
     $win = new OxWindow();
     $win->AddTitle("成功修改文档");
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display();
 }

src/admin/catalog_add.php

@@ -155,7 +155,7 @@ if ($dopost == 'quick') {
         if ($siteurl != '') {
             $siteurl = preg_replace("#\/$#", "", $siteurl);
             if (!preg_match("#http:\/\/#i", $siteurl)) {
-                ShowMsg("您绑定的二级域名无效，需要加http开头的链接", "-1");
+                ShowMsg("您绑定的二级域名无效，需要以http开头的链接", "-1");
                 exit();
             }
             if (preg_match("#".$cfg_basehost."#i", $siteurl)) {

src/admin/content_list.php

@@ -147,9 +147,9 @@ if ($stime > 0 && $etime > 0) {
 }
 if ($arcrank != '') {
     $whereSql .= " AND arc.arcrank = '$arcrank' ";
-    $CheckUserSend = "<button type='button' class='btn btn-success btn-sm' onClick=\"location='catalog_do.php?cid=".$cid."&dopost=listArchives&gurl=content_list.php';\">所有文档</button>";
+    $CheckUserSend = "<button type='button' class='btn btn-success btn-sm' onclick=\"location='catalog_do.php?cid=".$cid."&dopost=listArchives&gurl=content_list.php';\">所有文档</button>";
 } 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>";
+    $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;

src/admin/content_sg_list.php

@@ -69,9 +69,9 @@ if ($keyword != '') $whereSql .= " AND (arc.title like '%$keyword%') ";
 if ($cid != 0 && !empty(GetSonIds($cid))) $whereSql .= " AND arc.typeid in (".GetSonIds($cid).")";
 if ($arcrank != '') {
     $whereSql .= " AND arc.arcrank = '$arcrank' ";
-    $CheckUserSend = "<button type='button' class='btn btn-success btn-sm' onClick=\"location='content_sg_list.php?cid={$cid}&channelid={$channelid}&dopost=listArchives';\">所有文档</button>";
+    $CheckUserSend = "<button type='button' class='btn btn-success btn-sm' onclick=\"location='content_sg_list.php?cid={$cid}&channelid={$channelid}&dopost=listArchives';\">所有文档</button>";
 } else {
-    $CheckUserSend = "<button type='button' class='btn btn-success btn-sm' onClick=\"location='content_sg_list.php?cid={$cid}&channelid={$channelid}&dopost=listArchives&arcrank=-1';\">稿件审核</button>";
+    $CheckUserSend = "<button type='button' class='btn btn-success btn-sm' onclick=\"location='content_sg_list.php?cid={$cid}&channelid={$channelid}&dopost=listArchives&arcrank=-1';\">稿件审核</button>";
 }
 $query = "SELECT arc.aid,arc.aid as id,arc.typeid,arc.arcrank,arc.flag,arc.senddate,arc.channel,arc.title,arc.mid,arc.click,tp.typename,ch.typename as channelname FROM `$listtable` arc LEFT JOIN `#@__arctype` tp ON tp.id=arc.typeid LEFT JOIN `#@__channeltype` ch ON ch.id=arc.channel $whereSql ORDER BY arc.aid DESC";
 $dlist = new DataListCP();

src/admin/dialog/select_images.php

@@ -65,7 +65,7 @@ if (!empty($iseditor)) {
     <body>
         <div class="upload-bg">
             <div id="floater" class="napisdiv">
-                <a href="javascript:nullLink();" onClick="document.getElementById('floater').style.display='none';"><img src="../../static/web/img/icon_img.png" id="picview" title="关闭预览"></a>
+                <a href="javascript:nullLink();" onclick="document.getElementById('floater').style.display='none';"><img src="../../static/web/img/icon_img.png" id="picview" title="关闭预览"></a>
             </div>
             <table align="center" class="table icon">
                 <tr>
@@ -140,7 +140,7 @@ if (!empty($iseditor)) {
                         else  $lstyle = "";
                         $line = "<tr>
                         <td>
-                            <a href=\"javascript:;\" onClick=\"ChangeImage('$reurl');\"><img src='$reurl' title='$file'></a>
+                            <a href=\"javascript:;\" onclick=\"ChangeImage('$reurl');\"><img src='$reurl' title='$file'></a>
                             <a href=\"javascript:;\" onclick=\"ReturnImg('$reurl');\" $lstyle>$file</a>
                         </td>
                         <td>$filesize KB</td>
@@ -155,7 +155,7 @@ if (!empty($iseditor)) {
                         else  $lstyle = "";
                         $line = "<tr>
                         <td>
-                            <a href=\"javascript:;\" onClick=\"ChangeImage('$reurl');\"><img src='$reurl' title='$file'></a>
+                            <a href=\"javascript:;\" onclick=\"ChangeImage('$reurl');\"><img src='$reurl' title='$file'></a>
                             <a href=\"javascript:;\" onclick=\"ReturnImg('$reurl');\" $lstyle>$file</a>
                         </td>
                         <td>$filesize KB</td>

src/admin/freelist_main.php

@@ -16,8 +16,7 @@ if (empty($pagesize)) $pagesize = 30;
 if (empty($pageno)) $pageno = 1;
 if (empty($dopost)) $dopost = '';
 if (empty($orderby)) $orderby = 'aid';
-if (empty($keyword))
-{
+if (empty($keyword)) {
     $keyword = '';
     $addget = '';
     $addsql = '';

src/admin/inc/inc_archives_all.php

@@ -78,27 +78,27 @@ function GetFormItem($ctag)
     } else if ($ctag->GetAtt("type") == "datetime") {
         $nowtime = GetDateTimeMk(time());
         $innertext = "<input name=\"$fieldname\" value=\"$nowtime\" type=\"text\" id=\"$fieldname\" class=\"admin-input-lg\">";
-        $innertext .= "<input name=\"selPubtime\" type=\"button\" id=\"selkeyword\" value=\"选择\" onClick=\"showCalendar('$fieldname', 'Y-m-d H:i:00', '24');\">";
+        $innertext .= "<input name=\"selPubtime\" type=\"button\" id=\"selkeyword\" value=\"选择\" onclick=\"showCalendar('$fieldname', 'Y-m-d H:i:00', '24');\">";
         $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem);
         $formitem = str_replace("~form~", $innertext, $formitem);
         return $formitem;
     } else if ($ctag->GetAtt("type") == "img") {
-        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onClick=\"SelectImage('form1.$fieldname','big')\">\r\n";
+        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onclick=\"SelectImage('form1.$fieldname','big')\">\r\n";
         $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem);
         $formitem = str_replace("~form~", $innertext, $formitem);
         return $formitem;
     } else if ($ctag->GetAtt("type") == "media") {
-        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onClick=\"SelectMedia('form1.$fieldname')\">\r\n";
+        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onclick=\"SelectMedia('form1.$fieldname')\">\r\n";
         $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem);
         $formitem = str_replace("~form~", $innertext, $formitem);
         return $formitem;
     } else if ($ctag->GetAtt("type") == "addon") {
-        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onClick=\"SelectSoft('form1.$fieldname')\">\r\n";
+        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onclick=\"SelectSoft('form1.$fieldname')\">\r\n";
         $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem);
         $formitem = str_replace("~form~", $innertext, $formitem);
         return $formitem;
     } else if ($ctag->GetAtt("type") == "media") {
-        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onClick=\"SelectMedia('form1.$fieldname')\">\r\n";
+        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onclick=\"SelectMedia('form1.$fieldname')\">\r\n";
         $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem);
         $formitem = str_replace("~form~", $innertext, $formitem);
         return $formitem;
@@ -293,7 +293,7 @@ function GetFormItemValue($ctag, $fvalue)
     } else if ($ctag->GetAtt("type") == "datetime") {
         $nowtime = GetDateTimeMk($fvalue);
         $innertext = "<input name=\"$fieldname\" value=\"$nowtime\" type=\"text\" id=\"$fieldname\" class=\"admin-input-lg\">";
-        $innertext .= "<input name=\"selPubtime\" type=\"button\" id=\"selkeyword\" value=\"选择\" onClick=\"showCalendar('$fieldname', 'Y-m-d H:i:00', '24');\">";
+        $innertext .= "<input name=\"selPubtime\" type=\"button\" id=\"selkeyword\" value=\"选择\" onclick=\"showCalendar('$fieldname', 'Y-m-d H:i:00', '24');\">";
         $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem);
         $formitem = str_replace("~form~", $innertext, $formitem);
         return $formitem;
@@ -306,17 +306,17 @@ function GetFormItemValue($ctag, $fvalue)
         }
         $ntag = $ndtp->GetTag("img");
         $fvalue = trim($ntag->GetInnerText());
-        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onClick=\"SelectImage('form1.$fieldname','big')\">\r\n";
+        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onclick=\"SelectImage('form1.$fieldname','big')\">\r\n";
         $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem);
         $formitem = str_replace("~form~", $innertext, $formitem);
         return $formitem;
     } else if ($ctag->GetAtt("type") == "media") {
-        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onClick=\"SelectMedia('form1.$fieldname')\">\r\n";
+        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onclick=\"SelectMedia('form1.$fieldname')\">\r\n";
         $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem);
         $formitem = str_replace("~form~", $innertext, $formitem);
         return $formitem;
     } else if ($ctag->GetAtt("type") == "addon") {
-        $innertext = "<input type='text' name='$fieldname' id='$fieldname' value='$fvalue' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onClick=\"SelectSoft('form1.$fieldname')\">\r\n";
+        $innertext = "<input type='text' name='$fieldname' id='$fieldname' value='$fvalue' class='admin-input-lg'><input name='".$fieldname."_bt' type='button' value='选择' onclick=\"SelectSoft('form1.$fieldname')\">\r\n";
         $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem);
         $formitem = str_replace("~form~", $innertext, $formitem);
         return $formitem;

src/admin/inc/inc_menu.php

@@ -85,7 +85,6 @@ $menusMain = "<m:top item='1_' name='常用功能' icon='fa fa-desktop'>
     $addset
 </m:top>
 <m:top item='3_' name='附件管理' rank='sys_Upload,sys_MyUpload,plus_文件管理器' icon='fa fa-folder'>
-    <m:item name='上传新文件' link='media_add.php' rank='' target='main' />
     <m:item name='附件管理' link='media_main.php' rank='sys_Upload,sys_MyUpload' target='main' />
     <m:item name='文件管理器' link='media_main.php?dopost=filemanager' rank='plus_文件管理器' target='main' />
 </m:top>

src/admin/js/handlers.js

@@ -15,7 +15,7 @@ function addImage(src, pid) {
 	newImgDiv.innerHTML = '<div class="atlas-head"><img src="' + src + '"></div>' + delstr;
 	if (typeof arctype != 'undefined' && arctype == 'article') {
 		if (pid != 0) {
-			newImgDiv.innerHTML = '<div class="atlas-head"><img src="' + src + '" onClick="addtoEdit(' + pid + ')"></div>' + delstr;
+			newImgDiv.innerHTML = '<div class="atlas-head"><img src="' + src + '" onclick="addtoEdit(' + pid + ')"></div>' + delstr;
 		}
 	}
 	newImgDiv.innerHTML += '<div class="atlas-foot"><input type="text" name="picinfo' + atlasimg+ '" class="atlas-input" placeholder="请输入图片注释"></div>';

src/admin/js/list.js

@@ -6,7 +6,7 @@ function kwArc(aid) {
 	var qstr=getCheckboxItem();
 	if (aid==0) aid = getOneItem();
 	if (qstr=='') {
-		ShowMsg('需要选择一个或多个文档');
+		ShowMsg('请选择一个或多个文档');
 		return;
 	}
 	location="archives_do.php?aid="+aid+"&dopost=makekw&qstr="+qstr;
@@ -28,7 +28,7 @@ function checkArc(aid) {
 function moveArc(e, obj, cid){
 	var qstr=getCheckboxItem();
 	if (qstr=='') {
-		ShowMsg('需要选择一个或多个文档');
+		ShowMsg('请选择一个或多个文档');
 		return;
 	}
 	LoadQuickDiv(e, 'archives_do.php?dopost=moveArchives&qstr='+qstr+'&channelid='+cid+'&rnd='+Math.random(), 'moveArchives', 'auto', '180px');
@@ -43,7 +43,7 @@ function cAtts(jname, e, obj) {
 	var qstr=getCheckboxItem();
     var screeheight = document.body.clientHeight + 20;
 	if (qstr=='') {
-		ShowMsg('需要选择一个或多个文档');
+		ShowMsg('请选择一个或多个文档');
 		return;
 	}
 	LoadQuickDiv(e, 'archives_do.php?dopost=attsDlg&qstr='+qstr+'&dojob='+jname+'&rnd='+Math.random(), 'attsDlg', 'auto', '180px');

src/admin/js/main.js

@@ -390,7 +390,7 @@ function DedeConfirm(content = "", title = "确认提示") {
             reject("cancel");
             CloseModal(`DedeModal${modalID}`);
         }
-        let footer = `<button type="button" class="btn btn-outline-success btn-sm" onClick="__DedeConfirmRunClose(\'${modalID}\')">取消</button><button type="button" class="btn btn-success btn-sm" onClick="__DedeConfirmRun(\'${modalID}\')">确定</button>`;
+        let footer = `<button type="button" class="btn btn-outline-success btn-sm" onclick="__DedeConfirmRunClose(\'${modalID}\')">取消</button><button type="button" class="btn btn-success btn-sm" onclick="__DedeConfirmRun(\'${modalID}\')">确定</button>`;
         let modal = `<div id="DedeModal${modalID}" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="DedeModalLabel${modalID}"><div class="modal-dialog modal-dialog-centered" role="document"><div class="modal-content"><div class="modal-header"><h6 class="modal-title" id="DedeModalLabel${modalID}">${title}</h6>`;
         modal += `<button type="button" class="update-close" data-dismiss="modal" aria-label="Close"><i class="fa fa-times"></i></button>`;
         modal += `</div><div class="modal-body">${content}</div><div class="modal-footer">${footer}</div></div></div></div>`;
@@ -410,7 +410,7 @@ function ShowMsg(content, ...args) {
 	size = "";
 	if (typeof content == "undefined") content = "";
 	modalID = guid();
-	var footer = `<button type="button" class="btn btn-primary btn-sm" onClick="CloseModal(\'GKModal${modalID}\')">确定</button>`;
+	var footer = `<button type="button" class="btn btn-primary btn-sm" onclick="CloseModal(\'GKModal${modalID}\')">确定</button>`;
 	var noClose = false;
 	if (args.length == 1) {
 		//存在args参数

src/admin/module_main.php

@@ -244,7 +244,7 @@ if ($action == '') {
         $rooturl = $cfg_basehost.$cfg_cmspath;
         $setupsql = preg_replace("#_ROOTURL_#i", $rooturl, $setupsql);
         $setupsql = preg_replace("#[\r\n]{1,}#", "\n", $setupsql);
-        $sqls = @split(";[ \t]{0,}\n", $setupsql);
+        $sqls = preg_split('/;[ \t]{0,}\n/', $setupsql);
         foreach ($sqls as $sql) {
             if (trim($sql) != '') $dsql->ExecuteNoneQuery($sql);
         }

src/admin/mychannel_edit.php

@@ -53,41 +53,41 @@ if ($dopost == "show") {
     $win->AddHidden("id", $id);
     $win->AddHidden("dopost", 'copysave');
     $msg = "<tr>
-            <td width='260'>新模型id：</td>
-            <td><input name='newid' type='text' id='newid' value='{$newid}' class='admin-input-sm'></td>
-        </tr>
-        <tr>
-            <td>新模型名称：</td>
-            <td><input name='newtypename' type='text' id='newtypename' value='{$row['typename']}{$idname}' class='admin-input-lg'></td>
-        </tr>
-        <tr>
-            <td>新模型标识：</td>
-            <td><input name='newnid' type='text' id='newnid' value='{$row['nid']}{$idname}' class='admin-input-lg'></td>
-        </tr>
-        <tr>
-            <td>新附加表：</td>
-            <td><input name='newaddtable' type='text' id='newaddtable' value='{$row['addtable']}{$idname}' class='admin-input-lg'></td>
-        </tr>
-        <tr>
-            <td>复制模板：</td>
-            <td>
-                <label><input type='radio' name='copytemplet' id='copytemplet' value='1' checked='checked'> 复制</label>
-                <label><input type='radio' name='copytemplet' id='copytemplet' value='0'> 不复制</label>
-            </td>
-        </tr>";
+        <td width='260'>新模型id：</td>
+        <td><input name='newid' type='text' id='newid' value='{$newid}' class='admin-input-sm'></td>
+    </tr>
+    <tr>
+        <td>新模型名称：</td>
+        <td><input name='newtypename' type='text' id='newtypename' value='{$row['typename']}{$idname}' class='admin-input-lg'></td>
+    </tr>
+    <tr>
+        <td>新模型标识：</td>
+        <td><input name='newnid' type='text' id='newnid' value='{$row['nid']}{$idname}' class='admin-input-lg'></td>
+    </tr>
+    <tr>
+        <td>新附加表：</td>
+        <td><input name='newaddtable' type='text' id='newaddtable' value='{$row['addtable']}{$idname}' class='admin-input-lg'></td>
+    </tr>
+    <tr>
+        <td>复制模板：</td>
+        <td>
+            <label><input type='radio' name='copytemplet' id='copytemplet' value='1' checked='checked'> 复制</label>
+            <label><input type='radio' name='copytemplet' id='copytemplet' value='0'> 不复制</label>
+        </td>
+    </tr>";
     $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("ok", "");
     $win->Display();
     exit();
 } else if ($dopost == "export") {
     if ($id == -1) {
-        ShowMsg("专题文档模型不支持导出", "-1");
+        ShowMsg("专题模型不支持导出", "-1");
         exit();
     }
     $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id' ");
     $channelconfig = '';
-    $row['maintable'] = preg_replace('#dede_#', '#@__', $row['maintable']);
-    $row['addtable'] = preg_replace('#dede_#', '#@__', $row['addtable']);
+    $row['maintable'] = preg_replace('#biz_#', '#@__', $row['maintable']);
+    $row['addtable'] = preg_replace('#biz_#', '#@__', $row['addtable']);
     foreach ($row as $k => $v) {
         if ($k == 'fieldset') $v = "\r\n$v\r\n";
         $channelconfig .= "<channel:{$k}>$v</channel:{$k}>\r\n";
@@ -119,7 +119,7 @@ if ($dopost == "show") {
         $wecome_info = "<a href='mychannel_main.php'>文档模型管理</a> - 导入文档模型规则";
         $win = new OxWindow();
         $win->Init();
-        $win->AddMsgItem($msg);
+        $win->AddMsgItem("$msg");
         $winform = $win->GetWindow("hand");
         $win->Display();
         exit();
@@ -129,20 +129,35 @@ if ($dopost == "show") {
     $dtp = new DedeTagParse();
     $dtp->SetNameSpace('channel', '<', '>');
     $dtp->LoadSource($exconfig);
-    if (!is_array($dtp->CTags)) GotoStaMsg("<tr><td>文档模型规则出错</td></tr>");
+    if (!is_array($dtp->CTags)) GotoStaMsg("<tr>
+        <td>文档模型规则出错</td>
+    </tr>
+    <tr>
+        <td bgcolor='#f5f5f5' colspan='2' align='center'><button type='button' class='btn btn-success btn-sm' onclick=\"location='mychannel_main.php';\">文档模型管理</button></td>
+    </tr>");
     $fields = array();
     foreach ($dtp->CTags as $ctag) {
         $fname = $ctag->GetName('name');
         $fields[$fname] = trim($ctag->GetInnerText());
     }
     if (!isset($fields['nid']) || !isset($fields['fieldset'])) {
-        GotoStaMsg("<tr><td>文档模型规则出错</td></tr>");
+        GotoStaMsg("<tr>
+            <td>文档模型规则出错</td>
+        </tr>
+        <tr>
+            <td bgcolor='#f5f5f5' colspan='2' align='center'><button type='button' class='btn btn-success btn-sm' onclick=\"location='mychannel_main.php';\">文档模型管理</button></td>
+        </tr>");
     }
     //正常的导入过程
     $mysql_version = $dsql->GetVersion(true);
     $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE nid='{$fields['nid']}' ");
     if (is_array($row)) {
-        GotoStaMsg("<tr><td>已经存在相同的<span class='text-primary'>{$fields['nid']}</span>模型</td></tr>");
+        GotoStaMsg("<tr>
+            <td>已经存在相同的<span class='text-primary'>{$fields['nid']}</span>模型</td>
+        </tr>
+        <tr>
+            <td bgcolor='#f5f5f5' colspan='2' align='center'><button type='button' class='btn btn-success btn-sm' onclick=\"location='mychannel_main.php';\">文档模型管理</button></td>
+        </tr>");
     }
     //创建表
     if ($fields['issystem'] != -1) {
@@ -157,7 +172,12 @@ if ($dopost == "show") {
     }
     $rs = $dsql->ExecuteNoneQuery($tabsql);
     if (!$rs) {
-        GotoStaMsg("<tr><td>创建数据表失败</td></tr>");
+        GotoStaMsg("<tr>
+            <td>创建数据表失败：{$dsql->GetError()}</td>
+        </tr>
+        <tr>
+            <td bgcolor='#f5f5f5' colspan='2' align='center'><button type='button' class='btn btn-success btn-sm' onclick=\"location='mychannel_main.php';\">文档模型管理</button></td>
+        </tr>");
         exit();
     }
     if ($fields['issystem'] == 1) $fields['issystem'] = 0;
@@ -172,7 +192,12 @@ if ($dopost == "show") {
     $fields['fieldset'] = addslashes($fields['fieldset']);
     $inquery = "INSERT INTO `#@__channeltype` (`id`,`nid`,`typename`,`addtable`,`addcon`,`mancon`,`editcon`,`useraddcon`,`usermancon`,`usereditcon`,`fieldset`,`listfields`,`issystem`,`isshow`,`issend`,`arcsta`,`usertype`,`sendrank`) VALUES ('{$fields['newid']}','{$fields['nid']}','{$fields['typename']}','{$fields['addtable']}','{$fields['addcon']}','{$fields['mancon']}','{$fields['editcon']}','{$fields['useraddcon']}','{$fields['usermancon']}','{$fields['usereditcon']}','{$fields['fieldset']}','{$fields['listfields']}','{$fields['issystem']}','{$fields['isshow']}','{$fields['issend']}','{$fields['arcsta']}','{$fields['usertype']}','{$fields['sendrank']}' ); ";
     $rs = $dsql->ExecuteNoneQuery($inquery);
-    if (!$rs) GotoStaMsg("<tr><td>导入文档模型时发生错误</td></tr>");
+    if (!$rs) GotoStaMsg("<tr>
+        <td>导入文档模型时发生错误：{$dsql->GetError()}</td>
+    </tr>
+    <tr>
+        <td bgcolor='#f5f5f5' colspan='2' align='center'><button type='button' class='btn btn-success btn-sm' onclick=\"location='mychannel_main.php';\">文档模型管理</button></td>
+    </tr>");
     $dtp = new DedeTagParse();
     $dtp->SetNameSpace("field", "<", ">");
     $dtp->LoadSource($fieldset);
@@ -197,7 +222,12 @@ if ($dopost == "show") {
     if ($allfields != '') {
         $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET listfields='$allfields' WHERE id='{$fields['newid']}' ");
     }
-    GotoStaMsg("<tr><td>成功导入一个文档模型</td></tr>");
+    GotoStaMsg("<tr>
+        <td>成功导入一个文档模型</td>
+    </tr>
+    <tr>
+        <td bgcolor='#f5f5f5' colspan='2' align='center'><button type='button' class='btn btn-success btn-sm' onclick=\"location='mychannel_main.php';\">文档模型管理</button></td>
+    </tr>");
 } else if ($dopost == "copysave") {
     $cid = intval($cid);
     $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$cid' ", MYSQL_ASSOC);
@@ -226,7 +256,7 @@ if ($dopost == "show") {
         exit();
     } else {
         $errv = $dsql->GetError();
-        ShowMsg("复制模型失败，错误提示：$errv", "javascript:;");
+        ShowMsg("复制文档模型失败，错误提示：$errv", "javascript:;");
         exit();
     }
 } else if ($dopost == "save") {
@@ -244,7 +274,7 @@ if ($dopost == "show") {
     }
     $trueTable = str_replace("#@__", $cfg_dbprefix, $addtable);
     if (!$dsql->IsTable($trueTable)) {
-        ShowMsg("系统找不到您所指定的表<span class='text-primary'>$trueTable</span>，请您创建这个表", "-1");
+        ShowMsg("系统找不到您所指定的<span class='text-primary'>$trueTable</span>表", "-1");
         exit();
     }
     $dsql->ExecuteNoneQuery($query);
@@ -253,8 +283,8 @@ if ($dopost == "show") {
 } else if ($dopost == "gettemplets") {
     require_once(DEDEINC."/libraries/oxwindow.class.php");
     $row = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$id'");
-    $wintitle = "查看模型使用模板";
-    $wecome_info = "<a href='mychannel_main.php'>文档模型管理</a> - 查看模型模板";
+    $wintitle = "查看模型应用模板";
+    $wecome_info = "<a href='mychannel_main.php'>文档模型管理</a> - 模型应用模板";
     $win = new OxWindow();
     $win->Init("", "js/blank.js", "");
     $win->AddTitle("栏目<span class='text-primary'>".$row['typename']."</span>默认模板文件说明");
@@ -411,7 +441,7 @@ if ($dopost == "show") {
         $forms = "<form action=\"$cfg_cmspath/apps/advancedsearch.php\" method=\"post\">";
         $forms .= "<input type=\"hidden\" name=\"mid\" value=\"$mid\">";
         $forms .= "<input type=\"hidden\" name=\"dopost\" value=\"search\">";
-        $forms .= "关键词：<input type=\"text\" name=\"q\"><br>";
+        $forms .= "<label>关键词：<input type=\"text\" name=\"q\"></label><br>";
         $mainstring = '';
         if (!empty($mainfields) && is_array($mainfields)) {
             $mainstring = implode(',', $mainfields);
@@ -420,7 +450,7 @@ if ($dopost == "show") {
                     require_once(DEDEINC."/typelink/typelink.class.php");
                     $tl = new TypeLink(0);
                     $typeOptions = $tl->GetOptionArray(0, 0, $mid);
-                    $forms .= "栏目：<select name=\"typeid\">\r\n";
+                    $forms .= "<select name=\"typeid\">\r\n";
                     $forms .= "<option value=\"0\" selected>不限栏目</option>\r\n";
                     $forms .= $typeOptions;
                     $forms .= "</select><br>";
@@ -428,12 +458,12 @@ if ($dopost == "show") {
                 } else if ($mainfield == 'iscommend') {
                     $forms .= "<label><input type=\"checkbox\" name=\"iscommend\" value=\"1\"> 推荐</label><br>";
                 } else if ($mainfield == 'writer') {
-                    $forms .= "作者：<input type=\"text\" name=\"writer\" value=\"\"><br>";
+                    $forms .= "<label>作者：<input type=\"text\" name=\"writer\" value=\"\"></label><br>";
                 } else if ($mainfield == 'source') {
-                    $forms .= "来源：<input type=\"text\" name=\"source\" value=\"\"><br>";
+                    $forms .= "<label>来源：<input type=\"text\" name=\"source\" value=\"\"></label><br>";
                 } else if ($mainfield == 'senddate') {
-                    $forms .= "开始时间：<input type=\"text\" name=\"startdate\" value=\"\"><br>";
-                    $forms .= "结束时间：<input type=\"text\" name=\"enddate\" value=\"\"><br>";
+                    $forms .= "<label>开始时间：<input type=\"text\" name=\"startdate\" value=\"\"></label><br>";
+                    $forms .= "<label>结束时间：<input type=\"text\" name=\"enddate\" value=\"\"></label><br>";
                 }
             }
         }
@@ -446,15 +476,15 @@ if ($dopost == "show") {
                     require_once(DEDEINC."/typelink/typelink.class.php");
                     $tl = new TypeLink(0);
                     $typeOptions = $tl->GetOptionArray(0, 0, $mid);
-                    $forms .= "栏目：<select name=\"typeid\">\r\n";
+                    $forms .= "<select name=\"typeid\">\r\n";
                     $forms .= "<option value=\"0\" selected>不限栏目</option>\r\n";
                     $forms .= $typeOptions;
                     $forms .= "</select><br>";
                     $forms .= "<label><input type=\"checkbox\" name=\"includesons\" value=\"1\"> 包含子栏目</label><br>";
                     $addonstring .= 'typeid:int,';
                 } elseif ($addonfield == 'senddate') {
-                    $forms .= "开始时间：<input type=\"text\" name=\"startdate\" value=\"\"><br>";
-                    $forms .= "结束时间：<input type=\"text\" name=\"enddate\" value=\"\"><br>";
+                    $forms .= "<label>开始时间：<input type=\"text\" name=\"startdate\" value=\"\"></label><br>";
+                    $forms .= "<label>结束时间：<input type=\"text\" name=\"enddate\" value=\"\"></label><br>";
                     $addonstring .= 'senddate:datetime,';
                 }
             }
@@ -512,8 +542,8 @@ if ($dopost == "show") {
                         }
                     }
                 } elseif ($type == 'datetime') {
-                    $forms .= "开始时间：<input type=\"text\" name=\"startdate\" value=\"\"><br>";
-                    $forms .= "结束时间：<input type=\"text\" name=\"enddate\" value=\"\"><br>";
+                    $forms .= "<label>开始时间：<input type=\"text\" name=\"startdate\" value=\"\"></label><br>";
+                    $forms .= "<label>结束时间：<input type=\"text\" name=\"enddate\" value=\"\"></label><br>";
                 } else {
                     $tmp = '';
                 }
@@ -534,7 +564,7 @@ if ($dopost == "show") {
 		<script src="js/mode/css/css.js"></script>
 		<script src="js/mode/htmlmixed/htmlmixed.js"></script>';
         echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=$cfg_soft_lang\">";
-        echo "<p>下面生成的网页表单，请自行复制，根据自己需求修改样式后粘贴到对应的模板中</p><textarea id='content' class='form-control'>$forms</textarea>";
+        echo "<p>下面生成的网页表单，根据自己需求修改样式后粘贴到对应的模板中</p><textarea id='content' class='form-control'>$forms</textarea>";
         echo "<hr>";
         echo "<script>var editor = CodeMirror.fromTextArea(document.getElementById('content'), {
             lineNumbers: true,

src/admin/soft_add.php

@@ -238,7 +238,7 @@ if ($dopost != 'save') {
     $wecome_info = "文档管理 - 发布软件文档";
     $win = new OxWindow();
     $win->AddTitle("成功发布软件文档");
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", FALSE);
     $win->Display();
 }

src/admin/soft_edit.php

@@ -48,7 +48,7 @@ if ($dopost != 'save') {
                 if ($ctag->GetName() == 'link') {
                     $islocal = $ctag->GetAtt('islocal');
                     if ($islocal != 1) $needmsg = "<label class='ml-2'><input type='checkbox' name='del{$newRowStart}' value='1'> 删除</label>";
-                    else $needmsg = '<button type="button" name="sel1" id="sel1" class="btn btn-success btn-sm ml-2" onClick="SelectSoft(\'form1.softurl'.$newRowStart.'\')">选取</button>';
+                    else $needmsg = '<button type="button" name="sel1" id="sel1" class="btn btn-success btn-sm ml-2" onclick="SelectSoft(\'form1.softurl'.$newRowStart.'\')">选取</button>';
                     $nForm .= "<div class='py-2'><label>软件地址{$newRowStart}：<input type='text' name='softurl{$newRowStart}' value='".trim($ctag->GetInnerText())."' class='admin-input-lg'></label><label class='ml-2'>地址名称：<input type='text' name='servermsg{$newRowStart}' value='".$ctag->GetAtt("text")."' class='admin-input-sm'></label><input type='hidden' name='islocal{$newRowStart}' value='{$islocal}'>$needmsg</div>\r\n";
                     $newRowStart++;
                 }
@@ -216,7 +216,7 @@ if ($dopost != 'save') {
     $wecome_info = "文档管理 - 修改软件文档";
     $win = new OxWindow();
     $win->AddTitle("成功修改软件文档");
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", FALSE);
     $win->Display();
 }

src/admin/spec_add.php

@@ -183,7 +183,7 @@ if ($dopost != 'save') {
     $wecome_info = "专题管理 - 发布专题";
     $win = new OxWindow();
     $win->AddTitle("成功发布专题");
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", FALSE);
     $win->Display();
 }

src/admin/spec_edit.php

@@ -196,7 +196,7 @@ if ($dopost != 'save') {
     $wecome_info = "专题管理 - 修改专题";
     $win = new OxWindow();
     $win->AddTitle("成功修改专题");
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", FALSE);
     $win->Display();
 }

src/admin/templets/ad_add.htm

@@ -24,7 +24,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-info mb-0">广告代码标签“{dede:myad name='广告位标识'/}”调用</div>
+						<div class="alert alert-info mb-0">广告代码标签{dede:myad name='广告位标识'/}调用</div>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/album_add.htm

@@ -82,7 +82,7 @@
 						<table>
 							<tr>
 								<td width="120">标签：</td>
-								<td><input type="text" name="tags" id="tags" value="" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号分开，如“DedeBIZ,得德”）</td>
+								<td><input type="text" name="tags" id="tags" value="" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号分开，如：DedeBIZ,得德）</td>
 								<td width="60">权重：</td>
 								<td><input type="text" name="weight" id="weight" value="<?php echo $maxWright['cc'];?>" class="admin-input-sm">（越小越靠前）</td>
 							</tr>

src/admin/templets/album_edit.htm

@@ -83,7 +83,7 @@
 						<table>
 							<tr>
 								<td width="120">标签：</td>
-								<td><input type="text" name="tags" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号分开，如“DedeBIZ,得德”）</td>
+								<td><input type="text" name="tags" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号分开，如：DedeBIZ,得德）</td>
 								<td width="60">权重：</td>
 								<td><input type="text" name="weight" id="weight" value="<?php echo $arcRow['weight'];?>" class="admin-input-sm">（越小越靠前）</td>
 							</tr>

src/admin/templets/archives_add.htm

@@ -76,7 +76,7 @@
 						<table>
 							<tr>
 								<td width="120">标签：</td>
-								<td><input type="text" name="tags" id="tags" value="" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号分开，如“DedeBIZ,得德”）</td>
+								<td><input type="text" name="tags" id="tags" value="" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号分开，如：DedeBIZ,得德）</td>
 								<td width="60">权重：</td>
 								<td><input type="text" name="weight" id="weight" value="<?php echo $maxWright['cc'];?>" class="admin-input-sm">（越小越靠前）</td>
 							</tr>

src/admin/templets/archives_edit.htm

@@ -78,7 +78,7 @@
 						<table>
 							<tr>
 								<td width="120">标签：</td>
-								<td><input name="tags" type="text" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号分开，如“DedeBIZ,得德”）</td>
+								<td><input name="tags" type="text" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号分开，如：DedeBIZ,得德）</td>
 								<td width="60">权重：</td>
 								<td><input name="weight" type="text" id="weight" value="<?php echo $arcRow['weight'];?>" class="admin-input-sm">（越小越靠前）</td>
 							</tr>

src/admin/templets/article_add.htm

@@ -76,7 +76,7 @@
 						<table>
 							<tr>
 								<td width="120">标签：</td>
-								<td><input type="text" name="tags" id="tags" value="" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号分开，如“DedeBIZ,得德”）</td>
+								<td><input type="text" name="tags" id="tags" value="" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号分开，如：DedeBIZ,得德）</td>
 								<td width="60">权重：</td>
 								<td><input type="text" name="weight" id="weight" value="<?php echo $maxWright['cc'];?>" class="admin-input-sm">（越小越靠前）</td>
 							</tr>

src/admin/templets/article_description_main.htm

@@ -18,7 +18,7 @@
 					<td width="120">栏目id：</td>
 					<td>
 						<input type="text" name="channel" id="channel" value="1" class="admin-input-xs">
-						<span>（可在“<a href="mychannel_main.php">栏目模型管理</a>”处获得）</span>
+						<span>（可在<a href="mychannel_main.php">栏目模型管理</a>处获得）</span>
 					</td>
 					<td width="120">摘要大小：</td>
 					<td>

src/admin/templets/article_edit.htm

@@ -83,7 +83,7 @@
 						<table>
 							<tr>
 								<td width="120">标签：</td>
-								<td><input name="tags" type="text" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号分开，如“DedeBIZ,得德”）</td>
+								<td><input name="tags" type="text" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号分开，如：DedeBIZ,得德）</td>
 								<td width="60">权重：</td>
 								<td><input name="weight" type="text" id="weight" value="<?php echo $arcRow['weight'];?>" class="admin-input-sm">（越小越靠前）</td>
 							</tr>

src/admin/templets/catalog_add.htm

@@ -72,7 +72,7 @@
 								}
 								?>
 							</select>
-							<span>（支持多选）</span>
+							<span>（请选栏目的信息联动类型支持多选）</span>
 						</div>
 					</td>
 					<td>上级目录：</td>
@@ -182,7 +182,7 @@
 						<label><input type="radio" name="moresite" value="0" checked="checked"> 不启用</label>（需要绑定二级域名，系统变量中开启支持多站点）
 					</td>
 					<td>绑定域名：</td>
-					<td><input type="text" name="siteurl" id="siteurl" onChange="CheckPathSet();" class="admin-input-lg">（需要加http开头的链接）</td>
+					<td><input type="text" name="siteurl" id="siteurl" onChange="CheckPathSet();" class="admin-input-lg">（需要以http开头的链接）</td>
 				</tr>
 				<?php }?>
 				<tr>
@@ -244,24 +244,24 @@
 					<td>SEO标题：</td>
 					<td>
 						<input type="text" name="seotitle" id="seotitle" class="admin-input-lg">
-						<span>（标签“{dede:field.seotitle/}”调用）</span>
+						<span>（标签{dede:field.seotitle/}调用）</span>
 					</td>
 				</tr>
 				<tr>
 					<td>关键词：</td>
 					<td>
 						<textarea name="keywords" id="keywords" class="admin-textarea-sm"></textarea>
-						<span>（标签“{dede:field.keywords/}”调用）</span>
+						<span>（标签{dede:field.keywords/}调用）</span>
 					</td>
 					<td>描述：</td>
 					<td>
 						<textarea name="description" id="description" class="admin-textarea-sm"></textarea>
-						<span>（标签“{dede:field.description/}”调用）</span>
+						<span>（标签{dede:field.description/}调用）</span>
 					</td>
 				</tr>
 				<tr>
 					<td>栏目文档：</td>
-					<td>（标签“{dede:field.content/}”调用）</td>
+					<td>（标签{dede:field.content/}调用）</td>
 					<td>是否支持跨站调用：</td>
 					<td>
 						<input type="text" name="apikey" id="apikey" class="admin-input-lg" placeholder="请输入跨站调用秘钥">

src/admin/templets/catalog_edit.htm

@@ -68,7 +68,7 @@
 								}
 								?>
 							</select>
-							<span>（支持多选）</span>
+							<span>（请选栏目的信息联动类型支持多选）</span>
 						</div>
 					</td>
 					<td>上级目录：</td>
@@ -129,7 +129,7 @@
 				</tr>
 				<tr>
 					<td>文件保存目录：</td>
-					<td><input type="text" name="typedir" id="typedir" value="<?php echo $myrow['typedir']?>" class="admin-input-lg">（标签“{cmspath}”必填）</td>
+					<td><input type="text" name="typedir" id="typedir" value="<?php echo $myrow['typedir']?>" class="admin-input-lg">（标签{cmspath}”必填）</td>
 					<td>是否继承选项：</td>
 					<td><label><input type="checkbox" name="upnext" id="upnext" value="1"> 子类栏目继承顶级栏目的浏览权限、文档类型、模板风格等属性</label></td>
 				</tr>
@@ -167,7 +167,7 @@
 						<label><input type="radio" name="moresite" value="0" <?php if ($myrow['moresite']==0) echo "checked='checked'";?>> 不启用</label>（仅顶级栏目启用，子类栏目无效）
 					</td>
 					<td>绑定域名：</td>
-					<td><input type="text" name="siteurl" id="siteurl" value="<?php echo $myrow['siteurl']?>" class="admin-input-lg">（需要加http开头的链接）</td>
+					<td><input type="text" name="siteurl" id="siteurl" value="<?php echo $myrow['siteurl']?>" class="admin-input-lg">（需要以http开头的链接）</td>
 				</tr>
 				<tr>
 					<td>列表模板：</td>
@@ -228,24 +228,24 @@
 					<td>SEO标题：</td>
 					<td>
 						<input type="text" name="seotitle" id="seotitle" value="<?php echo $myrow['seotitle']?>" class="admin-input-lg">
-						<span>（标签“{dede:field.seotitle/}”调用）</span>
+						<span>（标签{dede:field.seotitle/}调用）</span>
 					</td>
 				</tr>
 				<tr>
 					<td>关键词：</td>
 					<td>
 						<textarea name="keywords" cid="keywords" class="admin-textarea-sm"><?php echo $myrow['keywords']?></textarea>
-						<span>（标签“{dede:field.keywords/}”调用）</span>
+						<span>（标签{dede:field.keywords/}调用）</span>
 					</td>
 					<td>描述：</td>
 					<td>
 						<textarea name="description" id="description" class="admin-textarea-sm"><?php echo $myrow['description']?></textarea>
-						<span>（标签“{dede:field.description/}”调用）</span>
+						<span>（标签{dede:field.description/}调用）</span>
 					</td>
 				</tr>
 				<tr>
 					<td>栏目文档：</td>
-					<td>（标签“{dede:field.content/}”调用）</td>
+					<td>（标签{dede:field.content/}调用）</td>
 					<td>是否支持跨站调用：</td>
 					<td>
 						<input value="<?php echo $myrow['apikey']?>" type="text" name="apikey" id="apikey" class="admin-input-lg" placeholder="请输入跨站调用秘钥">

src/admin/templets/diy_field_add.htm

@@ -27,7 +27,7 @@
 					</td>
 				</tr>
 				<tr>
-					<td width="260">提示文字：</td>
+					<td width="260">字段文字：</td>
 					<td>
 						<input type="text" name="itemname" id="itemname" class="admin-input-sm">
 						<span>（发布时显示提示文字）</span>
@@ -37,7 +37,7 @@
 					<td>字段名称：</td>
 					<td>
 						<input type="text" name="fieldname" id="fieldname" class="admin-input-sm">
-						<span>（只能用英文字母或数字，如果数据类型是联动类型，请填写联动类型的组名称）</span>
+						<span>（只能用英文字母或数字，如果数据类型是联动类型，请填写联动类型组名称）</span>
 					</td>
 				</tr>
 				<tr>
@@ -46,7 +46,7 @@
 						<input type="hidden" name="isnull" value="1">
 						<label><input type="radio" name="spage" value="split"> 是</label>
 						<label><input type="radio" name="spage" value="no" checked="checked"> 否</label>
-						<span>（如果文档使用分页符，文档用#p#副标题#e#作为分页符，实现文档分页，但仅允许一个字段）</span>
+						<span>（如果文档使用分页符，文档用#p#副标题#e#作为分页符实现文档分页，但仅允许一个字段）</span>
 					</td>
 				</tr>
 				<tr>
@@ -69,7 +69,7 @@
 				<tr>
 					<td>默认值：</td>
 					<td>
-						<p>（如果定义数据类型为select、radio、checkbox时，此处填写被选择的项目，英文逗号分开，如“DedeBIZ,得德”。如果为联动选框，这里填写联动选框项目名称）</p>
+						<p>（自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号分开，如：DedeBIZ,得德）</p>
 						<textarea name="vdefault" id="vdefault" class="admin-textarea-xl"></textarea>
 					</td>
 				</tr>

src/admin/templets/diy_field_edit.htm

@@ -24,7 +24,7 @@
 					<td bgcolor="#f5f5f5" colspan="2">自定义表单管理</a> - 自定义表单修改字段</td>
 				</tr>
 				<tr>
-					<td>提示文字：</td>
+					<td>字段文字：</td>
 					<td>
 						<input type="text" name="itemname" id="itemname" class="admin-input-sm" value="<?php echo $ctag->GetAtt('itemname')?>">
 						<span>（发布时显示提示文字）</span>
@@ -32,7 +32,7 @@
 				</tr>
 				<tr>
 					<td width="260">字段名称：</td>
-					<td><?php echo $fname?>（只能用英文字母或数字，如果数据类型是联动类型，请填写联动类型的组名称）</td>
+					<td><?php echo $fname?>（只能用英文字母或数字，如果数据类型是联动类型，请填写联动类型组名称）</td>
 				</tr>
 				<tr>
 					<td>是否使用分页符：</td>
@@ -40,7 +40,7 @@
 						<input type="hidden" name="isnull" value="1">
 						<label><input type="radio" name="spage" value="split" <?php if ($ctag->GetAtt('page')=='split') echo "checked='checked'";?>> 是</label>
 						<label><input type="radio" name="spage" value="no" <?php if ($ctag->GetAtt('page')=='no'||$ctag->GetAtt('page')=='') echo "checked='checked'";?>> 否</label>
-						<span>（如果文档使用分页符，文档用#p#副标题#e#作为分页符，实现文档分页，但仅允许一个字段）</span>
+						<span>（如果文档使用分页符，文档用#p#副标题#e#作为分页符实现文档分页，但仅允许一个字段）</span>
 					</td>
 				</tr>
 				<tr>
@@ -75,7 +75,7 @@
 				<tr>
 					<td>默认值：</td>
 					<td>
-						<p>（如果定义数据类型为select、radio、checkbox时，此处填写被选择的项目，英文逗号分开，如“DedeBIZ,得德”。如果为联动选框，这里填写联动选框项目名称）</p>
+						<p>（自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号分开，如：DedeBIZ,得德）</p>
 						<textarea name="vdefault" id="vdefault" class="admin-textarea-xl"><?php echo $ctag->GetAtt('default');?></textarea>
 					</td>
 				</tr>

src/admin/templets/file_edit.htm

@@ -32,14 +32,14 @@
 					<td>工作目录</td>
 					<td>
 						<input name="activepath" value="{dede:global name='activepath'/}" class="admin-input-lg">
-						<span>（空白表示根目录，不可以用“..”符号表示路径）</span>
+						<span>（空白表示根目录，不可以用..符号表示路径）</span>
 					</td>
 				</tr>
 				<tr>
 					<td>文件名称</td>
 					<td>
 						<input name="filename" value="{dede:global name='filename'/}" class="admin-input-lg">
-						<span>（不可以用“..”符号表示路径）</span>
+						<span>（不可以用..符号表示路径）</span>
 					</td>
 				</tr>
 				<tr class="table">

src/admin/templets/file_upload.htm

@@ -12,24 +12,30 @@
 		<form method="POST" enctype="multipart/form-data" action="file_manage_control.php" name="form1">
 			<input type="hidden" name="activepath" value="{dede:global name='activepath'/}">
 			<input type="hidden" name="fmdo" value="upload">
-			<table width="98%" align="center" class="my-3">
+			<table align="center" class="table maintable my-3">
 				<tr>
+					<td bgcolor="#f5f5f5" colspan="2">文件上传</td>
+				</tr>
+				<tr>
+					<td width="260">当前目录：</td>
+					<td>{dede:global name='activepath'/}</td>
+				</tr>
+				<tr>
+					<td>上传操作：</td>
 					<td>
-						<p>
-							<input type="button" name="bbb" class="btn btn-success btn-sm" onclick="make_upload();" value="添加上传框">
-							<a href="file_manage_main.php?activepath={dede:global name='activepath'/}" class="btn btn-outline-success btn-sm">返回{dede:global name='activepath'/}目录</a>
-						</p>
+						<button type="button" class="btn btn-success btn-sm" name="bbb" onclick="make_upload();">添加上传框</button>
+						<a href="file_manage_main.php?activepath={dede:global name='activepath'/}" class="btn btn-success btn-sm">返回目录</a>
 					</td>
 				</tr>
 				<tr>
-					<td id="upfield">
-						<p>文件1：<input type="file" name="upfile1" class="admin-input-lg"></p>
+					<td  colspan="2" id="upfield">
+						<div class="mb-3"><label>文件1：<input type="file" name="upfile1" class="admin-input-lg"></label></div>
 					</td>
 				</tr>
 				<tr>
-					<td>
-						<input type="submit" class="btn btn-success btn-sm" value="上传文件" name="B1">
-						<input type="button" class="btn btn-success btn-sm" value="重设表单" name="B12" onclick="reset_upload();">
+					<td bgcolor="f5f5f5"  colspan="2" align="center">
+						<button type="submit" class="btn btn-success btn-sm" name="B1">上传文件</button>
+						<button type="button" class="btn btn-success btn-sm" name="B12" onclick="reset_upload();">重新上传</button>
 					</td>
 				</tr>
 			</table>
@@ -40,12 +46,12 @@
 			{
 				i++;
 				myob = document.getElementById("upfield");
-				myob.innerHTML+="<p>文件"+i+"：<input type='file' name='upfile"+i+"' class='admin-input-lg'></p>";
+				myob.innerHTML+="<div class='mb-3'><label>文件"+i+"：<input type='file' name='upfile"+i+"' class='admin-input-lg'></label></div>";
 			}
 			function reset_upload()
 			{
 				myob = document.getElementById("upfield");
-				myob.innerHTML="<p>文件1：<input type='file' name='upfile1' class='admin-input-lg'></p>";
+				myob.innerHTML="<div class='mb-3'><label>文件1：<input type='file' name='upfile1' class='admin-input-lg'></label></div>";
 			}
 		</script>
 	</body>

src/admin/templets/makehtml_homepage.htm

@@ -19,7 +19,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-info mb-0">首页默认更新文件存放在根目录，如果不是根目录安装网站又想首页更新到网站根目录，使用相对路径来表示首页位置，例：安装在“http://www.abc.com/DedeBIZ/目录”，更新首页为：“http://www.abc.com/index.html”，填写：“../index.html”</div>
+						<div class="alert alert-info mb-0">首页默认更新文件存放在根目录，如果不是根目录安装网站又想首页更新到网站根目录，使用相对路径来表示首页位置，例：安装在http://www.abc.com/DedeBIZ/目录，更新首页为：http://www.abc.com/index.html，填写：../index.html</div>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/makehtml_taglist.htm

@@ -48,7 +48,7 @@
 					<td>更新位置：</td>
 					<td>
 						<input type="text" name="tagsdir" id="tagsdir" value="<?php echo $cfg_tags_dir;?>" class="admin-input-sm" disabled>
-						<span>（系统设置中其他选项“标签生成目录”项进行调整）</span>
+						<span>（系统设置中其他选项标签生成目录进行调整）</span>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/media_add.htm

@@ -20,7 +20,7 @@
 					<td bgcolor="#f5f5f5" colspan="2">添加附件</td>
 				</tr>
 				<tr>
-					<td width="260">媒体类型：</td>
+					<td width="260">附件类型：</td>
 					<td>
 						<label><input type="radio" name="mediatype" value="1" checked="checked"> 图片</label>
 						<label><input type="radio" name="mediatype" value="2"> FLASH</label>
@@ -29,19 +29,19 @@
 					</td>
 				</tr>
 				<tr>
-					<td>说明标题：</td>
+					<td>附件标题：</td>
 					<td><input type="text" name="title" id="title" class="admin-input-lg"></td>
 				</tr>
 				<tr>
 					<td>附加参数：</td>
 					<td>
-						<label>宽：<input type="text" name="mediawidth" id="mediawidth" class="admin-input-sm">（像素）</label>
-						<label><label>高：<input type="text" name="mediaheight" id="mediaheight" class="admin-input-sm">（像素）</label>
-						<label>播放时间：<input type="text" name="playtime" id="mediawidth3" class="admin-input-sm">（分钟）</label>
+						<label>宽：<input type="text" name="mediawidth" id="mediawidth" class="admin-input-sm" placeholder="附件像素宽度"></label>
+						<label>高：<input type="text" name="mediaheight" id="mediaheight" class="admin-input-sm" placeholder="附件像高宽度"></label>
+						<label>播放时间：<input type="text" name="playtime" id="mediawidth3" class="admin-input-sm" placeholder="附件播放分钟"></label>
 					</td>
 				</tr>
 				<tr>
-					<td>上传文件：</td>
+					<td>上传附件：</td>
 					<td>
 						<label>数量：<input type="text" name="picnum" id="picnum" value="5" class="admin-input-sm"></label>
 						<button type="button" name="Submit" class="btn btn-success btn-sm" onclick="MakeUpload()">添加</button>
@@ -50,16 +50,16 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<p><input type="file" name="upfile1" id="upfile1" class="admin-input-lg"></p>
-						<p><input type="file" name="upfile2" id="upfile2" class="admin-input-lg"></p>
-						<p><input type="file" name="upfile3" id="upfile3" class="admin-input-lg"></p>
-						<p><input type="file" name="upfile4" id="upfile4" class="admin-input-lg"></p>
-						<p><input type="file" name="upfile5" id="upfile5" class="admin-input-lg"></p>
-						<span id="uploadfield"></span>
+						<div class="mb-3"><label>附件1：<input type="file" name="upfile1" id="upfile1" class="admin-input-lg"></label></div>
+						<div class="mb-3"><label>附件2：<input type="file" name="upfile2" id="upfile2" class="admin-input-lg"></label></div>
+						<div class="mb-3"><label>附件3：<input type="file" name="upfile3" id="upfile3" class="admin-input-lg"></label></div>
+						<div class="mb-3"><label>附件4：<input type="file" name="upfile4" id="upfile4" class="admin-input-lg"></label></div>
+						<div class="mb-3"><label>附件5：<input type="file" name="upfile5" id="upfile5" class="admin-input-lg"></label></div>
+						<div id="uploadfield"></div>
 					</td>
 				</tr>
 				<tr>
-					<td bgcolor="#f5f5f5" colspan="2" align="center"><button type="submit" class="btn btn-success btn-sm">保存</button></td>
+					<td bgcolor="#f5f5f5" colspan="2" align="center"><button type="submit" class="btn btn-success btn-sm">上传附件</button></td>
 				</tr>
 			</table>
 		</form>
@@ -77,9 +77,9 @@
 			function MakeUpload() {
 				var upfield = document.getElementById("uploadfield");
 				var endNum = Number(document.form1.picnum.value) + startNum;
-				if (endNum > 40) endNum = 40;
+				if (endNum > 30) endNum = 30;
 				for (startNum; startNum <= endNum; startNum++) {
-					upfield.innerHTML += "<p><input type='file' name='upfile" + startNum + "' class='admin-input-lg'></p>";
+					upfield.innerHTML += "<div class='mb-3'><label>附件" + startNum + "：<input type='file' name='upfile" + startNum + "' class='admin-input-lg'></label></div>";
 				}
 			}
 			function ResetUpload() {

src/admin/templets/media_edit.htm

@@ -21,7 +21,7 @@
 					<td bgcolor="#f5f5f5" colspan="2">修改附件</td>
 				</tr>
 				<tr>
-					<td width="260">媒体类型：</td>
+					<td width="260">附件类型：</td>
 					<td>
 						<label><input type="radio" name="mediatype" value="1" <?php if ($myrow['mediatype']==1) echo "checked";?>> 图片</label>
 						<label><input type="radio" name="mediatype" value="2" <?php if ($myrow['mediatype']==2) echo "checked";?>> FLASH</label>
@@ -30,15 +30,15 @@
 					</td>
 				</tr>
 				<tr>
-					<td>说明标题：</td>
+					<td>附件标题：</td>
 					<td><input type="text" name="title" id="title" value="<?php echo $myrow['title']?>" class="admin-input-lg"></td>
 				</tr>
 				<tr>
 					<td>附加参数：</td>
 					<td>
-						<label>宽：<input type="text" name="mediawidth" id="mediawidth" value="<?php echo $myrow['width']?>" class="admin-input-sm">（像素）</label>
-						<label>高：<input type="text" name="mediaheight" id="mediaheight" value="<?php echo $myrow['height']?>" class="admin-input-sm">（像素）</label>
-						<label>播放时间：<input type="text" name="playtime" id="playtime" value="<?php echo $myrow['playtime']?>" class="admin-input-sm">（分钟）</label>
+						<label>宽：<input type="text" name="mediawidth" id="mediawidth" value="<?php echo $myrow['width']?>" class="admin-input-sm" placeholder="附件像素宽度"></label>
+						<label>高：<input type="text" name="mediaheight" id="mediaheight" value="<?php echo $myrow['height']?>" class="admin-input-sm" placeholder="附件像高宽度"></label>
+						<label>播放时间：<input type="text" name="playtime" id="playtime" value="<?php echo $myrow['playtime']?>" class="admin-input-sm"  placeholder="附件播放分钟"></label>
 					</td>
 				</tr>
 				<tr>
@@ -49,13 +49,12 @@
 					</td>
 				</tr>
 				<?php
-				if ($myrow['mediatype']==1)
-				{
+				if ($myrow['mediatype'] == 1) {
 					$fullfilename = $cfg_basedir.$myrow['url'];
-					if (file_exists($fullfilename)){
+					if (file_exists($fullfilename)) {
 						$info = "";
 						$sizes = getimagesize($fullfilename,$info);
-						if (is_array($sizes)){
+						if (is_array($sizes)) {
 							if ($sizes[0]>200) $w=200;
 							else $w = $sizes[0];
 				?>
@@ -65,7 +64,7 @@
 				</tr>
 				<?php }}}?>
 				<tr>
-					<td>修改文件：</td>
+					<td>修改附件：</td>
 					<td><input type="file" name="upfile" id="upfile" class="admin-input-lg"></td>
 				</tr>
 				<tr>

src/admin/templets/mychannel_add.htm

@@ -35,7 +35,7 @@
 					<td>模型标识：</td>
 					<td>
 						<input type="text" name="nid" id="nid" class="admin-input-sm" value="model<?php echo $newid;?>">
-						<span>（建议由英文、数字或下划线组成，示例“article_名字标识.htm”，列表和封面模板类推）</span>
+						<span>（建议由英文、数字或下划线组成，示例article_名字标识.htm，列表和封面模板类推）</span>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/mychannel_edit.htm

@@ -40,7 +40,7 @@
 				</tr>
 				<tr>
 					<td>模型标识：</td>
-					<td><?php echo $row['nid'];?>（建议由英文、数字或下划线组成，示例“article_名字标识.htm”，列表和封面模板类推）</td>
+					<td><?php echo $row['nid'];?>（建议由英文、数字或下划线组成，示例article_名字标识.htm，列表和封面模板类推）</td>
 				</tr>
 				<tr>
 					<td>模型名称：</td>
@@ -108,7 +108,7 @@
 					<td>列表附加字段：</td>
 					<td>
 						<input type="text" name="listfields" id="listfields" class="admin-input-lg" value="<?php echo $row['listfields'];?>" class="w-50">
-						<span>（用英文逗号分开，列表模板“{dede:list channelid='模型id' addfields='字段1,字段2'}{/dede:list}”中，标签“[field:name/]”调用）</span>
+						<span>（用英文逗号分开，列表模板{dede:list channelid='模型id' addfields='字段1,字段2'}{/dede:list}中，标签[field:name/]调用）</span>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/mychannel_field_add.htm

@@ -27,7 +27,7 @@
 					</td>
 				</tr>
 				<tr>
-					<td width="260">提示文字：</td>
+					<td width="260">字段文字：</td>
 					<td>
 						<input type="text" name="itemname" id="itemname" class="admin-input-sm">
 						<span>（发布时显示提示文字）</span>
@@ -37,7 +37,7 @@
 					<td>字段名称：</td>
 					<td>
 						<input type="text" name="fieldname" id="fieldname" class="admin-input-sm">
-						<span>（只能用英文字母或数字，如果数据类型是联动类型，请填写联动类型的组名称）</span>
+						<span>（只能用英文字母或数字，如果数据类型是联动类型，请填写联动类型组名称）</span>
 					</td>
 				</tr>
 				<tr>
@@ -52,7 +52,7 @@
 					<td>
 						<label><input type="checkbox" name="notsend" id="notsend" value="1"> 投稿和采集禁用字段</label>
 						<label><input type="checkbox" name="islist" id="islist" value="1"> 添加到列表附加字段</label>
-						<span>（列表模板“{dede:list channelid='模型id' addfields='字段1,字段2'}{/dede:list}”中，标签“[field:name/]”调用）</span>
+						<span>（列表模板{dede:list channelid='模型id' addfields='字段1,字段2'}{/dede:list}中，标签[field:name/]调用）</span>
 					</td>
 				</tr>
 				<tr>
@@ -61,7 +61,7 @@
 						<input type="hidden" name="isnull" value="1">
 						<label><input type="radio" name="spage" value="split"> 是</label>
 						<label><input type="radio" name="spage" value="no" checked="checked"> 否</label>
-						<span>（如果文档使用分页符，文档用#p#副标题#e#作为分页符，实现文档分页，但仅允许一个字段）</span>
+						<span>（如果文档使用分页符，文档用#p#副标题#e#作为分页符实现文档分页，但仅允许一个字段）</span>
 					</td>
 				</tr>
 				<tr>
@@ -111,7 +111,7 @@
 				<tr>
 					<td>默认值：</td>
 					<td>
-						<p>（如果定义数据类型为select、radio、checkbox时，此处填写被选择的项目，英文逗号分开，如“DedeBIZ,得德”。如果为联动选框，这里填写联动选框项目名称）</p>
+						<p>（自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号分开，如：DedeBIZ,得德）</p>
 						<textarea name="vdefault" id="vdefault" class="admin-textarea-xl"></textarea>
 					</td>
 				</tr>

src/admin/templets/mychannel_field_edit.htm

@@ -31,7 +31,7 @@
 				</tr>
 				<?php }?>
 				<tr>
-					<td>提示文字：</td>
+					<td>字段文字：</td>
 					<td>
 						<input type="text" name="itemname" id="itemname" class="admin-input-sm" value="<?php echo $ctag->GetAtt('itemname')?>">
 						<span>（发布文档时显示的项名字）</span>
@@ -39,7 +39,7 @@
 				</tr>
 				<tr>
 					<td width="260">字段名称：</td>
-					<td><?php echo $fname?>（只能用英文字母或数字，如果数据类型是联动类型，请填写联动类型的组名称）</td>
+					<td><?php echo $fname?>（只能用英文字母或数字，如果数据类型是联动类型，请填写联动类型组名称）</td>
 				</tr>
 				<tr>
 					<td>字段类型：</td>
@@ -53,7 +53,7 @@
 					<td>
 						<label><input type="checkbox" name="notsend" id="notsend" value="1" <?php echo ($ctag->GetAtt('notsend')==1 ? " checked":"");?>> 投稿和采集禁用字段</label>
 						<label><input type="checkbox" name="islist" id="islist" value="1" <?php echo ($ctag->GetAtt('islist')==1 ? " checked":"");?>> 添加到列表附加字段</label>
-						<span>（列表模板“{dede:list channelid='模型id' addfields='字段1,字段2'}{/dede:list}”中，标签“[field:name/]”调用）</span>
+						<span>（列表模板{dede:list channelid='模型id' addfields='字段1,字段2'}{/dede:list}中，标签[field:name/]调用）</span>
 					</td>
 				</tr>
 				<tr>
@@ -62,7 +62,7 @@
 						<input name="isnull" type="hidden" value="1">
 						<label><input type="radio" name="spage" value="split" <?php if ($ctag->GetAtt('page')=='split') echo "checked='checked'";?>> 是</label>
 						<label><input type="radio" name="spage" value="no" <?php if ($ctag->GetAtt('page')=='no'||$ctag->GetAtt('page')=='') echo "checked='checked'";?>> 否</label>
-						<span>（如果文档使用分页符，文档用#p#副标题#e#作为分页符，实现文档分页，但仅允许一个字段）</span>
+						<span>（如果文档使用分页符，文档用#p#副标题#e#作为分页符实现文档分页，但仅允许一个字段）</span>
 					</td>
 				</tr>
 				<tr>
@@ -123,7 +123,7 @@
 				<tr>
 					<td>默认值：</td>
 					<td>
-						<p>（如果定义数据类型为select、radio、checkbox时，此处填写被选择的项目，英文逗号分开，如“DedeBIZ,得德”。如果为联动选框，这里填写联动选框项目名称）</p>
+						<p>（自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号分开，如：DedeBIZ,得德）</p>
 						<textarea name="vdefault" id="vdefault" class="admin-textarea-xl"><?php echo $ctag->GetAtt('default');?></textarea>
 					</td>
 				</tr>

src/admin/templets/mychannel_main.htm

@@ -14,7 +14,7 @@
 			<tr>
 				<td>
 					<a href="mychannel_add.php" class="btn btn-success btn-sm">添加新模型</a>
-					<a href="mychannel_edit.php?dopost=exportin" class="btn btn-success btn-sm">导入模型</a>
+					<a href="mychannel_edit.php?dopost=exportin" class="btn btn-success btn-sm">导入文档模型</a>
 					<a href="stepselect_main.php" class="btn btn-success btn-sm">联动类型管理</a>
 				</td>
 			</tr>

src/admin/templets/soft_add.htm

@@ -92,7 +92,7 @@
 						<table>
 							<tr>
 								<td width="120">标签：</td>
-								<td><input type="text" name="tags" id="tags" value="" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号分开，如“DedeBIZ,得德”）</td>
+								<td><input type="text" name="tags" id="tags" value="" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号分开，如：DedeBIZ,得德）</td>
 								<td width="60">权重：</td>
 								<td><input type="text" name="weight" id="weight" value="<?php echo $maxWright['cc'];?>" class="admin-input-sm">（越小越靠前）</td>
 							</tr>

src/admin/templets/soft_edit.htm

@@ -94,7 +94,7 @@
 						<table>
 							<tr>
 								<td width="120">标签：</td>
-								<td><input type="text" name="tags" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号分开，如“DedeBIZ,得德”）</td>
+								<td><input type="text" name="tags" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号分开，如：DedeBIZ,得德）</td>
 								<td width="60">权重：</td>
 								<td><input type="text" name="weight" id="weight" value="<?php echo $arcRow['weight'];?>" class="admin-input-sm">（越小越靠前）</td>
 							</tr>

src/admin/templets/spec_add.htm

@@ -67,7 +67,7 @@
 				</tr>
 				<tr>
 					<td class="admin-td">
-						<div class="alert alert-info mb-0">文档列表用“1,2,3”英文逗号分开，系统会自动排除不同节点的相同文档。关于单条记录模板里“[field:fieldname/]”标签，请参考关于系统帮助关于arclist标签</div>
+						<div class="alert alert-info mb-0">文档列表用1,2,3英文逗号分开，系统会自动排除不同节点的相同文档。单条记录模板标签[field:fieldname/]调用，请参考关于系统帮助关于arclist标签</div>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/spec_edit.htm

@@ -65,7 +65,7 @@
 				</tr>
 				<tr>
 					<td class="admin-td">
-						<div class="alert alert-info mb-0">文档列表用“1,2,3”英文逗号分开，系统会自动排除不同节点的相同文档。关于单条记录模板里“[field:fieldname/]”标签，请参考关于系统帮助关于arclist标签</div>
+						<div class="alert alert-info mb-0">文档列表用1,2,3英文逗号分开，系统会自动排除不同节点的相同文档。单条记录模板标签[field:fieldname/]调用，请参考关于系统帮助关于arclist标签</div>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/stepselect_main.htm

@@ -166,7 +166,7 @@
 					<button type="button" name="gedit" id="gedit" class="btn btn-success btn-sm" onclick="EditType()">修改</button>
 					<button type="button" name="gdel" id="gdel" class="btn btn-success btn-sm" onclick="DelType()">删除</button>
 					<button type="button" name="gview" id="gview" class="btn btn-success btn-sm" onclick="ViewType()">预览</button>
-					<button type="button" name="addnew" id="addnew" class="btn btn-success btn-sm" onclick="AddType()">新增类别组</button>
+					<button type="button" name="addnew" id="addnew" class="btn btn-success btn-sm" onclick="AddType()">新增联动组</button>
 					<a href="stepselect_main.php?action=upallcache" class="btn btn-success btn-sm">更新所有缓存</a>
 				</td>
 			</tr>
@@ -238,7 +238,7 @@
 					<td width="6%">选择</td>
 					<td width="6%">id</td>
 					<td width="20%">枚举名</td>
-					<td width="20%">类别组名</td>
+					<td width="20%">类别名</td>
 					<td width="10%">枚举类型</td>
 					<td width="10%">枚举值</td>
 					<td width="10%">组内排序</td>

src/admin/templets/stepselect_showajax.htm

@@ -10,7 +10,7 @@ if ($action=='edit') {
 	<div class="pb-3"><label>类别名：<input type="text" name="itemname" class="admin-input-lg" value="<?php echo $arr['itemname'];?>"></label></div>
 	<div class="pb-3">
 		<label>缓存名：<input type="text" name="egroup" value="<?php echo $arr['egroup'];?>" class="admin-input-lg"></label>
-		<span>（缓存组名必须用英文或数字）</span>
+		<span>（缓存名必须用英文或数字）</span>
 	</div>
 	<div>
 		<a href="javascript:CloseTWin();" class="btn btn-success btn-sm">关闭</a>
@@ -25,7 +25,7 @@ if ($action=='edit') {
 	<div class="pb-3"><label>类别名：<input type="text" name="itemname" class="admin-input-lg" required="required"></label></div>
 	<div class="pb-3">
 		<label>缓存名：<input type="text" name="egroup" class="admin-input-lg" required="required"></label>
-		<span>（缓存组名必须用英文或数字）</span>
+		<span>（缓存名必须用英文或数字）</span>
 	</div>
 	<div class="text-center">
 		<a href="javascript:CloseTWin();" class="btn btn-success btn-sm">关闭</a>

src/admin/templets/templets_one_add.htm

@@ -20,7 +20,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-info mb-0">文档单页管理仅适用于页面较少的情况（建议小于500个页面）标签“{dede:field name='body'/}”调用</div>
+						<div class="alert alert-info mb-0">文档单页管理仅适用于页面较少的情况（建议小于500个页面）标签{dede:field name='body'/}调用</div>
 					</td>
 				</tr>
 				<tr>
@@ -49,7 +49,7 @@
 						}
 						echo "</select>";
 						?>
-						<span>（通过这个标识来识别类同页面，模板中用“{dede:likesgpage id='标识'/}”调用有相同标识的页面）</span>
+						<span>（通过这个标识来识别类同页面，标签{dede:likesgpage id='标识'/}调用有相同标识的页面）</span>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/templets_one_edit.htm

@@ -21,7 +21,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-info mb-0">文档单页管理仅适用于页面较少的情况（建议小于500个页面）标签“{dede:field name='body'/}”调用</div>
+						<div class="alert alert-info mb-0">文档单页管理仅适用于页面较少的情况（建议小于500个页面）标签{dede:field name='body'/}调用</div>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/tpl_edit.htm

@@ -28,7 +28,7 @@
 					<td width="260">文件名称</td>
 					<td>
 						<input name=filename value="<?php echo $filename;?>" class="admin-input-lg">
-						<span>（不可以用“..”符号表示路径）</span>
+						<span>（不可以用..符号表示路径）</span>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/tpl_edit_tag.htm

@@ -37,7 +37,7 @@
 					<td width="260">文件名称</td>
 					<td>
 						<input name="filename" value="<?php echo $filename;?>" class="admin-input-lg">
-						<span>（不可以用“..”符号表示路径）</span>
+						<span>（不可以用..符号表示路径）</span>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/tpl_newfile.htm

@@ -16,7 +16,7 @@
 					<td width="260">工作目录：</td>
 					<td>
 						<input name="path" value="<?php echo $path;?>" class="admin-input-lg">
-						<span>（空白表示根目录，不允许用“..” 形式的路径）</span>
+						<span>（空白表示根目录，不可以用..符号表示路径）</span>
 					</td>
 				</tr>
 				<tr>

src/admin/tpl.php

@@ -207,7 +207,7 @@ else if ($action == 'savetagfile') {
     $wecome_info = "<a href='templets_tagsource.php'>标签源码管理</a> - 新建修改标签";
     $win = new OxWindow();
     $win->AddTitle("新建修改标签");
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display();
     exit();

src/apps/jump.php

@@ -25,7 +25,7 @@ if (preg_match("#^http#", $url)) {
         $wecome_info = "页面跳转提示";
         $win = new OxWindow();
         $win->AddTitle("您将要访问的链接不属于当前站点，请关注您的账号安全。");
-        $win->AddMsgItem($msg);
+        $win->AddMsgItem("$msg");
         $winform = $win->GetWindow("hand", false);
         $win->Display();
     } else {

src/install/sql-dfdata.txt

@@ -3947,7 +3947,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin
 ('17','cfg_mediatype','允许的多媒体文件类型','3','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov'),
 ('18','cfg_specnote','专题的最大节点数','2','number','10'),
 ('19','cfg_list_symbol','栏目位置的间隔符号','2','string',''),
-('20','cfg_notallowstr','禁用关键词，用“|”分开，但不要在结尾加“|”','5','bstring','乡巴佬|傻子'),
+('20','cfg_notallowstr','禁用关键词，用|分开，但不要在结尾加|','5','bstring','乡巴佬|傻子'),
 ('21','cfg_feedbackcheck','是否需审核评论及留言','5','bool','Y'),
 ('22','cfg_keyword_replace','是否使用关键词替换功能，开启影响文档生成速度','2','bool','Y'),
 ('23','cfg_rewrite','是否使用伪静态，参考栏目修改中提示默认规则','1','bool','N'),
@@ -3978,7 +3978,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin
 ('48','cfg_cli_time','服务器时区设置','2','number','8'),
 ('49','cfg_mb_addontype','会员附件许可的类型','4','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov|zip|rar|doc|xsl|ppt|wps'),
 ('50','cfg_mb_max','会员附件总大小限制（MB）','4','number','500'),
-('51','cfg_replacestr','禁用关键词替换成*，用“|”分开，但不要在结尾加“|”','5','bstring','乡巴佬|傻子'),
+('51','cfg_replacestr','禁用关键词替换成*，用|分开，但不要在结尾加|','5','bstring','乡巴佬|傻子'),
 ('52','cfg_makeindex','发布文档后马上更新网站首页','6','bool','N'),
 ('53','cfg_keyword_like','使用关键词关连文档','6','bool','Y'),
 ('54','cfg_index_max','首页调用函数最大索引文档数，不适用于经常单栏目采集过多文档网站，不启用本项此值设置为0即可','6','number','10000'),

src/system/common.func.php

@@ -352,7 +352,7 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
             $gourl = 'javascript:;';
             $func .= "window.parent.document.getElementById('{$tgobj}').style.display='none';\r\n";
         }
-        $func .= "var pgo=0;function JumpUrl(){if (pgo==0){location='$gourl'; pgo=1;}}";
+        $func .= "var pgo=0;function JumpUrl(){if (pgo==0) {location='$gourl'; pgo=1;}}";
         $rmsg = $func;
         $rmsg .= "document.write(\"<div class='tips'><div class='tips-box'><div class='tips-head'><p>系统提示</p></div>\");";
         $rmsg .= "document.write(\"<div class='tips-body'>\");";

src/system/customfields.func.php

@@ -105,13 +105,13 @@ function GetFormItem($ctag, $admintype = 'admin')
         $innertext = "<input type='text' name='$fieldname' value='$nowtime' id='$fieldname' class='form-control admin-input-lg datepicker'>";
     } else if ($fieldType == 'img') {
         $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
-        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-lg' placeholder='请选择图片上传或填写图片地址'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectImage('$fname.$fieldname','big')\">";
+        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-lg' placeholder='请选择图片上传或填写图片地址'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onclick=\"SelectImage('$fname.$fieldname','big')\">";
     } else if ($fieldType == 'media') {
         $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
-        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-lg' placeholder='请选择多媒体上传或填写多媒体地址'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectMedia('$fname.$fieldname')\">";
+        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-lg' placeholder='请选择多媒体上传或填写多媒体地址'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onclick=\"SelectMedia('$fname.$fieldname')\">";
     } else if ($fieldType == 'addon') {
         $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
-        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-lg' placeholder='请选择附件上传或填写附件地址'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectSoft('$fname.$fieldname')\">";
+        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-lg' placeholder='请选择附件上传或填写附件地址'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onclick=\"SelectSoft('$fname.$fieldname')\">";
     } else if ($fieldType == 'int' || $fieldType == 'float') {
         $dfvalue = ($ctag->GetAtt('default') != '' ? $ctag->GetAtt('default') : '0');
         $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-xs' value='$dfvalue'>";
@@ -370,17 +370,17 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '')
         }
         $fvalue = empty($fvalue)? $tmpValue : $fvalue;
         $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
-        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-lg'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectImage('$fname.$fieldname','big')\">";
+        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-lg'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onclick=\"SelectImage('$fname.$fieldname','big')\">";
     } else if ($ftype == "imgfile") {
         $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
         $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-lg'>";
     } else if ($ftype == "media") {
         $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
-        $selectStr = "<input type='button'  name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectMedia('$fname.$fieldname')\">";
+        $selectStr = "<input type='button'  name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onclick=\"SelectMedia('$fname.$fieldname')\">";
         $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-lg'> $selectStr";
     } else if ($ftype == "addon") {
         $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
-        $selectStr = "<input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectSoft('$fname.$fieldname')\">";
+        $selectStr = "<input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onclick=\"SelectSoft('$fname.$fieldname')\">";
         $innertext = "<input type='text' name='$fieldname' id='$fieldname' value='$fvalue' class='form-control admin-input-lg'> $selectStr";
     } else if ($ftype == "int" || $ftype == "float") {
         $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-xs' value='$fvalue'>";

src/system/dedevote.class.php

@@ -120,7 +120,7 @@ class DedeVote
             }
             $items .= "<tr><td>\r\n";
             $items .= "<input type='submit' name='vbt1' class='btn btn-success' value='投票'>\r\n";
-            $items .= "<input type='button' name='vbt2' class='btn btn-success' value='查看结果' onClick=window.open('".$GLOBALS['cfg_phpurl']."/vote.php?dopost=view&aid=".$this->VoteID."');>";
+            $items .= "<input type='button' name='vbt2' class='btn btn-success' value='查看结果' onclick=window.open('".$GLOBALS['cfg_phpurl']."/vote.php?dopost=view&aid=".$this->VoteID."');>";
             $items .= "</td></tr>\r\n";
         }
         $items .= "</form>\r\n</table>\r\n";

src/system/libraries/oxwindow.class.php

@@ -62,11 +62,11 @@ class OxWindow
         $this->myWin .= "<table width='100%'>";
     }
     /**
-     *  添加单列的标题
+     *  添加单列标题
      *
      * @access    public
      * @param     string  $title  标题
-     * @param     string  $col  列数
+     * @param     string  $col  列
      * @return    string
      */
     function AddTitle($title, $col = "2")
@@ -81,11 +81,10 @@ class OxWindow
         $this->myWinItem .= "</tr>";
     }
     /**
-     *  添加单列的消息
+     *  添加单列信息
      *
      * @access    public
-     * @param     string  $ivalue  消息行
-     * @param     string  $col  列数
+     * @param     string  $ivalue  信息
      * @return    void
      */
     function AddMsgItem($ivalue)
@@ -93,7 +92,7 @@ class OxWindow
         $this->myWinItem .= "$ivalue";
     }
     /**
-     *  添加两列
+     *  添加两列信息
      *
      * @access    public
      * @param     string  $iname  名称
@@ -170,12 +169,17 @@ class OxWindow
                 $this->myWin .= "<tr>
                     <td bgcolor='#f5f5f5' colspan='2' align='center'>
                     <button type='submit' class='btn btn-success btn-sm'>$tt</button>
-                    <button type='button' class='btn btn-outline-success btn-sm' onClick='history.go(-1);'>返回</button>
+                    <button type='button' class='btn btn-outline-success btn-sm' onclick='history.go(-1);'>返回</button>
                     </td>
                 </tr>";
             } else {
-                if ($msg != '') {
-                    $this->myWin .= "<tr><td>$msg</td></tr>";
+                if ($msg != "") {
+                    $this->myWin .= "<tr>
+                        <td>$msg</td>
+                    </tr>
+                    <tr>
+                        <td bgcolor='#f5f5f5' colspan='2' align='center'><button type='button' class='btn btn-success btn-sm' onclick='history.go(-1);'>返回</button></td>
+                    </tr>";
                 } else {
                     $this->myWin .= '';
                 }
@@ -217,7 +221,7 @@ class OxWindow
  *  显示一个不带表单的普通提示
  *
  * @access    public
- * @param     string   $msg  消息提示信息
+ * @param     string   $msg  提示信息
  * @param     string   $title  提示标题
  * @return    string
  */

src/system/typelink/typeunit.class.admin.php

@@ -110,7 +110,7 @@ class TypeUnit
             if ($ispart == 0) {
                 //列表栏目
                 echo "<tr>";
-                echo "<td class='admin-td'><table width='100%'><tr><td width='50%'><i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-success btn-xs'>列表</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]（文档数：".$this->GetTotalArc($id)."）";
+                echo "<td class='admin-td'><table width='100%'><tr><td width='50%'><i id='img".$id."' onclick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-success btn-xs'>列表</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]（文档数：".$this->GetTotalArc($id)."）";
                 echo "</td>";
                 echo "<td align='right'><a href='{$GLOBALS['cfg_phpurl']}/list.php?tid={$id}' target='_blank' title='预览' class='btn btn-light btn-sm'><i class='fa fa-eye'></i></a>";
                 echo "<a href='catalog_do.php?cid={$id}&dopost=listArchives' title='文档' class='btn btn-light btn-sm'><i class='fa fa-file-text'></i></a>";
@@ -122,7 +122,7 @@ class TypeUnit
             } else if ($ispart == 1) {
                 //封面栏目
                 echo "<tr>";
-                echo "<td class='admin-td'><table width='100%'><tr><td width='50%'><i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-warning btn-xs'>封面</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
+                echo "<td class='admin-td'><table width='100%'><tr><td width='50%'><i id='img".$id."' onclick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-warning btn-xs'>封面</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
                 echo "</td>";
                 echo "<td align='right'><a href='{$GLOBALS['cfg_phpurl']}/list.php?tid={$id}' target='_blank' title='预览' class='btn btn-light btn-sm'><i class='fa fa-eye'></i></a>";
                 echo "<a href='catalog_do.php?cid={$id}&dopost=listArchives' title='文档' class='btn btn-light btn-sm'><i class='fa fa-file-text'></i></a>";
@@ -134,7 +134,7 @@ class TypeUnit
             } else if ($ispart == 2) {
                 //外部栏目
                 echo "<tr>";
-                echo "<td class='admin-td'><table width='100%'><tr><td width='50%'><i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-primary btn-xs'>外部</span>{$nss}<a href='catalog_edit.php?id=".$id."' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
+                echo "<td class='admin-td'><table width='100%'><tr><td width='50%'><i id='img".$id."' onclick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-primary btn-xs'>外部</span>{$nss}<a href='catalog_edit.php?id=".$id."' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
                 echo "</td>";
                 echo "<td align='right'><a href='{$typeDir}' target='_blank' title='预览' class='btn btn-light btn-sm'><i class='fa fa-eye'></i></a>";
                 echo "<a href='catalog_add.php?id={$id}' title='添加' class='btn btn-light btn-sm'><i class='fa fa-plus-circle'></i></a>";
@@ -194,7 +194,7 @@ class TypeUnit
                     //列表栏目
                     echo "<tr>";
                     echo "<td class='admin-td'><table width='100%'><tr><td width='50%'>";
-                    echo "$step<i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-success btn-xs'>列表</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]（文档数：".$this->GetTotalArc($id)."）";
+                    echo "$step<i id='img".$id."' onclick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-success btn-xs'>列表</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]（文档数：".$this->GetTotalArc($id)."）";
                     echo "</td>";
                     echo "<td align='right'><a href='{$GLOBALS['cfg_phpurl']}/list.php?tid={$id}' target='_blank' title='预览' class='btn btn-light btn-sm'><i class='fa fa-eye'></i></a>";
                     echo "<a href='catalog_do.php?cid={$id}&dopost=listArchives' title='文档' class='btn btn-light btn-sm'><i class='fa fa-file-text'></i></a>";
@@ -207,7 +207,7 @@ class TypeUnit
                     //封面栏目
                     echo "<tr>";
                     echo "<td class='admin-td'><table width='100%'><tr><td width='50%'>";
-                    echo "$step<i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-warning btn-xs'>封面</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
+                    echo "$step<i id='img".$id."' onclick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-warning btn-xs'>封面</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
                     echo "</td>";
                     echo "<td align='right'><a href='{$GLOBALS['cfg_phpurl']}/list.php?tid={$id}' target='_blank' title='预览' class='btn btn-light btn-sm'><i class='fa fa-eye'></i></a>";
                     echo "<a href='catalog_do.php?cid={$id}&dopost=listArchives' title='文档' class='btn btn-light btn-sm'><i class='fa fa-file-text'></i></a>";
@@ -220,7 +220,7 @@ class TypeUnit
                     //外部栏目
                     echo "<tr>";
                     echo "<td class='admin-td'><table width='100%'><tr><td width='50%'>";
-                    echo "$step<i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-primary btn-xs'>外部</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
+                    echo "$step<i id='img".$id."' onclick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-primary btn-xs'>外部</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
                     echo "</td>";
                     echo "<td align='right'><a href='{$typeDir}' target='_blank' title='预览' class='btn btn-light btn-sm'><i class='fa fa-eye'></i></a>";
                     echo "<a href='catalog_edit.php?id={$id}' title='修改' class='btn btn-light btn-sm'><i class='fa fa-pencil-square'></i></a>";

src/system/typelink/typeunit.class.menu.php

@@ -98,7 +98,7 @@ class TypeUnit
                 continue;
             }
             echo "<dl>\r\n";
-            echo "<dd><img onClick=\"LoadSuns('suns{$id}',{$id});\" style='cursor:pointer'></dd>\r\n";
+            echo "<dd><img onclick=\"LoadSuns('suns{$id}',{$id});\" style='cursor:pointer'></dd>\r\n";
             echo "<dd><a href='catalog_do.php?cid=".$id."&dopost=listArchives'{$smenu}>".$typeName."</a></dd>\r\n";
             echo "</dl>\r\n";
             echo "<div id='suns".$id."'>";

src/theme/dedebiz/article_article.htm

@@ -59,7 +59,7 @@
 										<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
 										<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
 										<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
+										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onclick="window.print();">打印</a></li>
 									</ul>
 								</div>
 							</div>

src/theme/dedebiz/article_default.htm

@@ -46,7 +46,7 @@
 						<nav class="py-3">
 							<ul class="pagination justify-content-center">{dede:pagebreak/}</ul>
 						</nav>
-						<div class="alert alert-warning">您会看到这个提示，那是因为您的系统无法识别某栏目的模型信息，或者您新建模型后，没为这个模型设计单独的模板不同模型的文档浏览页的模板为：article_模型名字标识.htm如“article_article.htm”，更多的信息您可以在栏目模型管理的地方查看</div>
+						<div class="alert alert-warning">您会看到这个提示，因为系统无法识别某栏目的模型信息或者您新建模型后，没为模型设计单独的模板，不同模型的文档浏览页的模板为：article_模型名字标识.htm更多的信息您可以在栏目模型管理的地方查看</div>
 						{dede:fieldlist}
 						<table class="table">
 							<tr>
@@ -70,7 +70,7 @@
 										<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
 										<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
 										<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
+										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onclick="window.print();">打印</a></li>
 									</ul>
 								</div>
 							</div>

src/theme/dedebiz/article_default_sg.htm

@@ -48,7 +48,7 @@
 						<nav class="py-3">
 							<ul class="pagination justify-content-center">{dede:pagebreak/}</ul>
 						</nav>
-						<div class="alert alert-info mt-3">您会看到这个提示，那是因为您的系统无法识别某栏目的模型信息，或者您新建模型后，没为这个模型设计单独的模板不同模型的文档浏览页的模板为：article_模型名字标识.htm如“article_article.htm”，更多的信息您可以在栏目模型管理的地方查看</div>
+						<div class="alert alert-info mt-3">您会看到这个提示，因为系统无法识别某栏目的模型信息或者您新建模型后，没为模型设计单独的模板，不同模型的文档浏览页的模板为：article_模型名字标识.htm更多的信息您可以在栏目模型管理的地方查看</div>
 						{dede:fieldlist}
 						<table class="table">
 							<tr>
@@ -72,7 +72,7 @@
 										<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
 										<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
 										<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
+										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onclick="window.print();">打印</a></li>
 									</ul>
 								</div>
 							</div>

src/theme/dedebiz/article_image.htm

@@ -134,7 +134,7 @@
 										<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
 										<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
 										<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
+										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onclick="window.print();">打印</a></li>
 									</ul>
 								</div>
 							</div>

src/theme/dedebiz/article_infos.htm

@@ -65,7 +65,7 @@
 										<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
 										<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
 										<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
+										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onclick="window.print();">打印</a></li>
 									</ul>
 								</div>
 							</div>

src/theme/dedebiz/article_soft.htm

@@ -73,7 +73,7 @@
 										<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
 										<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
 										<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
+										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onclick="window.print();">打印</a></li>
 									</ul>
 								</div>
 							</div>

src/theme/dedebiz/widget_article_feedback.htm

@@ -26,7 +26,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="dcmp-submit"><button type="button" class="btn btn-success btn-md" onClick="SendFeedback()">发表评论</button></div>
+		<div class="dcmp-submit"><button type="button" class="btn btn-success btn-md" onclick="SendFeedback()">发表评论</button></div>
 	</div>
 	<div class="feedbacks">
 		{dede:feedback}
@@ -106,7 +106,7 @@
 		let replyPannel = `<div class="form-group">
 			<div class="input-group">
 				<input type="text" class="form-control iptReplyContent">
-				<button type="button" class="btn btn-success btn-send" onClick='SendReplyFeedback(${fid})'>评论</button>
+				<button type="button" class="btn btn-success btn-send" onclick='SendReplyFeedback(${fid})'>评论</button>
 			</div>
 		</div>`;
 		$.get("{dede:global.cfg_cmsurl/}/user/api.php?format=json", function(result) {

src/user/album_add.php

@@ -153,7 +153,7 @@ if (empty($dopost)) {
     $wintitle = "成功发布图片文档";
     $wecome_info = "图片管理 - 发布图片文档";
     $win = new OxWindow();
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");
 }

src/user/album_edit.php

@@ -131,7 +131,7 @@ if (empty($dopost)) {
     $wintitle = "成功修改图片文档";
     $wecome_info = "图片管理 - 修改图片文档";
     $win = new OxWindow();
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");
 }

src/user/archives_add.php

@@ -126,7 +126,7 @@ if (empty($dopost)) {
     $wintitle = "成功发布自定义文档";
     $wecome_info = "文档管理 - 发布自定义文档";
     $win = new OxWindow();
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");
 }

src/user/archives_edit.php

@@ -94,7 +94,7 @@ if (empty($dopost)) {
     $wintitle = "成功修改自定义文档";
     $wecome_info = "文档管理 - 修改自定义文档";
     $win = new OxWindow();
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");
 }

src/user/archives_sg_add.php

@@ -156,7 +156,7 @@ if (empty($dopost)) {
     $wintitle = "成功发布分类文档";
     $wecome_info = "文档管理 - 发布分类文档";
     $win = new OxWindow();
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");
 }

src/user/archives_sg_edit.php

@@ -110,7 +110,7 @@ if (empty($dopost)) {
     $wintitle = "成功修改分类文档";
     $wecome_info = "文档管理 - 修改分类文档";
     $win = new OxWindow();
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");
 }

src/user/article_add.php

@@ -115,7 +115,7 @@ if (empty($dopost)) {
     $wintitle = "成功发布文档";
     $wecome_info = "文档管理 - 发布文档";
     $win = new OxWindow();
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");
 }

src/user/article_edit.php

@@ -89,7 +89,7 @@ if (empty($dopost)) {
     $wintitle = "成功修改文档";
     $wecome_info = "文档管理 - 修改文档";
     $win = new OxWindow();
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");
 }

src/user/buy_action.php

@@ -208,7 +208,7 @@ if ($paytype === 0) {
             $wintitle = "使用微信支付";
             $wecome_info = "微信支付";//这个空格不要去
             $win = new OxWindow();
-            $win->AddMsgItem($msg);
+            $win->AddMsgItem("$msg");
             $winform = $win->GetWindow("hand", false);
             $win->Display(DEDEMEMBER."/templets/win_templet.htm");
         } catch (Exception $e) {
@@ -251,7 +251,7 @@ if ($paytype === 0) {
         $wintitle = "使用银行转账";
         $wecome_info = "银行转账";//这个空格不要去
         $win = new OxWindow();
-        $win->AddMsgItem($msg);
+        $win->AddMsgItem("$msg");
         $winform = $win->GetWindow("hand", false);
         $win->Display(DEDEMEMBER."/templets/win_templet.htm");
     } elseif ($paytype === 4) {

src/user/index_do.php

@@ -255,7 +255,7 @@ if ($fmdo == 'sendMail') {
     $wintitle = "快来邀请好友赚积分啦";
     $wecome_info = "邀请好友赚积分";
     $win = new OxWindow();
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");
     exit;

src/user/soft_add.php

@@ -169,7 +169,7 @@ if (empty($dopost)) {
     $wintitle = "成功发布文档文档";
     $wecome_info = "软件管理 - 发布软件文档";
     $win = new OxWindow();
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");
 }

src/user/soft_edit.php

@@ -50,7 +50,7 @@ if (empty($dopost)) {
         if (is_array($dtp->CTags)) {
             foreach ($dtp->CTags as $ctag) {
                 if ($ctag->GetName() == 'link') {
-                    $nForm .= "<div class='form-group'><label>下载地址".$newRowStart."：</label><div class='input-group mb-3'><input type='text' name='softurl".$newRowStart."' value='".trim($ctag->GetInnerText())."' class='form-control'><div class='input-group-append'><span class='btn btn-success btn-send' onClick=\"SelectSoft('addcontent.softurl".$newRowStart."')\">选择</span></div></div>
+                    $nForm .= "<div class='form-group'><label>下载地址".$newRowStart."：</label><div class='input-group mb-3'><input type='text' name='softurl".$newRowStart."' value='".trim($ctag->GetInnerText())."' class='form-control'><div class='input-group-append'><span class='btn btn-success btn-send' onclick=\"SelectSoft('addcontent.softurl".$newRowStart."')\">选择</span></div></div>
                     <label>下载名称：</label><input type='text' name='servermsg".$newRowStart."' value='".$ctag->GetAtt("text")."' class='form-control'></div>";
                     $newRowStart++;
                 }
@@ -167,7 +167,7 @@ if (empty($dopost)) {
     $wintitle = "成功修改软件文档";
     $wecome_info = "软件管理 - 修改软件文档";
     $win = new OxWindow();
-    $win->AddMsgItem($msg);
+    $win->AddMsgItem("$msg");
     $winform = $win->GetWindow("hand", false);
     $win->Display(DEDEMEMBER."/templets/win_templet.htm");
 }

src/user/templets/album_edit.htm

@@ -105,7 +105,7 @@
 								<label>图片<?php echo $j;?>上传：</label>
 								<div class="input-group mb-3">
 									<input type="text" name="imgfile<?php echo $j;?>" class="form-control" value="<?php echo trim($ctag->GetInnerText());?>" placeholder="请输入网址">
-									<div class="input-group-append"><span class="btn btn-success btn-send" onClick="SelectImage('addcontent.imgfile<?php echo $j;?>', 'big')">选择</span></div>
+									<div class="input-group-append"><span class="btn btn-success btn-send" onclick="SelectImage('addcontent.imgfile<?php echo $j;?>', 'big')">选择</span></div>
 								</div>
 								<label>图片<?php echo $j;?>简介：</label>
 								<textarea name="imgmsg<?php echo $j;?>" class="form-control"><?php echo trim($ctag->GetAtt('text'))?></textarea>

src/user/templets/buy.htm

@@ -28,12 +28,13 @@
 						<?php if ($cfg_money_scores > 0) {?>							
 						<?php $canCav = floor($cfg_ml->fields['scores'] / $cfg_money_scores);?>
 						<div class="pb-3">
-							<p>积分兑换金币（<?php echo "兑换价格{$cfg_money_scores}积分/个，您目前可兑换金币{$canCav}";?>）</p>
+							<h3 class="mb-3">积分换金币</h3>
+							<p><?php echo "兑换价格{$cfg_money_scores}积分/个，您目前可兑换金币{$canCav}";?></p>
 							<form name="formrank" action="index_do.php?dopost=money2s&fmdo=user" method="post">
 								<table class="table">
 									<tbody>
 										<tr>
-											<td width="20%">兑换数量：</td>
+											<td width="30%">兑换数量：</td>
 											<td><input type="text" name="money" id="money" class="form-control w-25" value="<?php echo $canCav;?>"></td>
 										</tr>
 										<tr>
@@ -46,19 +47,19 @@
 						</div>
 						<?php }?>
 						<div class="pb-3">
-							<h4 class="mb-3">积分充值</h4>
+							<h3 class="mb-3">积分充值</h3>
 							<form name="formrank" action="check_card.php" method="post">
 								<table class="table">
 									<tbody>
 										<tr>
-											<td width="20%">积分密码：</td>
+											<td width="30%">积分卡号：</td>
 											<td><input type="text" name="cardid" id="cardid" class="form-control w-25"></td>
 										</tr>
 										<tr>
 											<td>验证码</td>
 											<td>
 												<input type="text" name="vdcode" id="vdcode" class="form-control text-uppercase d-inline-block w-25">
-												<img src="/apps/vdimgck.php" title="验证码" onclick="this.src=this.src+'?'">
+												<img src="<?php echo $cfg_cmsurl;?>/apps/vdimgck.php" onclick="this.src='<?php echo $cfg_cmsurl;?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
 											</td>
 										</tr>
 										<tr>
@@ -70,7 +71,7 @@
 							</form>
 						</div>
 						<div class="pb-3">
-							<h4 class="mb-3">购买金币</h4>
+							<h3 class="mb-3">购买金币</h3>
 							<form name="f1" action="buy_action.php" method="post">
 								<input type="hidden" name="product" value="card">
 								<table class="table">
@@ -88,7 +89,7 @@
 							</form>
 						</div>
 						<div>
-							<h4 class="mb-3">账号升级</h4>
+							<h3 class="mb-3">账号升级</h3>
 							<form name="f1" action="buy_action.php" method="post">
 								<input type="hidden" name="product" value="member">
 								<table class="table">

src/user/templets/buy_action_payment.htm

@@ -25,8 +25,8 @@
 							</ul>
 							<span class="navbar-text"><a href="javascript:history.back(-1);" class="btn btn-outline-success btn-sm">返回</a></span>
 						</nav>
-						<div class="alert alert-success">您申请购买的产品如下，确认无误后请点击“购买并支付”按钮，进行网上支付，如果支付失败，请与管理员联系其它支付方式</div>
-						<h4 class="py-3">订单确认</h4>
+						<div class="alert alert-success">您申请购买的产品如下，确认无误后请点击购买并支付按钮，进行网上支付，如果支付失败，请与管理员联系其它支付方式</div>
+						<h3 class="py-3">订单确认</h3>
 						<form method="post" name="E_FORM" action="buy_action.php" target="_blank">
 							<input type="hidden" name="pd_encode" value="<?php echo $pr_encode;?>">
 							<input type="hidden" name="pd_verify" value="<?php echo $pr_verify;?>">

src/user/templets/index.htm

@@ -74,7 +74,7 @@
 					<div class="py-3">
 						<div class="pannel-main-container shadow-sm rounded">
 							<div class="media-body item-article">
-								<h4 class="mb-3 userspace">用户空间<span class="info">（<?php echo $minfos['totaluse'];?>MB/<?php echo $cfg_mb_max;?>MB）</span></h4>
+								<h3 class="mb-3 userspace">用户空间<span class="info">（<?php echo $minfos['totaluse'];?>MB/<?php echo $cfg_mb_max;?>MB）</span></h3>
 								<div class="progress">
 									<div class="progress-bar progress-bar-striped bg-success" role="progressbar" aria-valuenow="<?php echo $ddsize;?>%" aria-valuemin="0" aria-valuemax="100" style="width:<?php echo $ddsize;?>%"><?php echo $ddsize;?>%</div>
 								</div>
@@ -85,7 +85,7 @@
 					<div class="pt-3">
 						<div class="pannel-main-container shadow-sm rounded">
 							<div class="media-body item-article">
-								<h4 class="mb-3">最新文档</h4>
+								<h3 class="mb-3">最新文档</h3>
 								<ul>
 									<?php foreach ($archives as $archive) {?>
 									<li><a href="<?php echo $archive['htmlurl'];?>" title="<?php echo $archive['title'];?>"><?php echo $archive['title'];?></a></li>

src/user/templets/reg-new.htm

@@ -39,7 +39,7 @@
 									<label>验证码</label>
 									<div class="input-group">
 										<input type="text" name="vdcode" id="iptValidate" class="form-control text-uppercase" placeholder="请输入验证码" required="required">
-										<img src="<?php echo $cfg_cmsurl;?>/apps/vdimgck.php" id="validateimg" onClick="this.src='<?php echo $cfg_cmsurl;?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
+										<img src="<?php echo $cfg_cmsurl;?>/apps/vdimgck.php" id="validateimg" onclick="this.src='<?php echo $cfg_cmsurl;?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
 									</div>
 								</div>
 								<div class="form-group form-check">

src/user/templets/soft_add.htm

@@ -161,7 +161,7 @@
 								<label>下载地址：</label>
 								<div class="input-group mb-3">
 									<input type="text" name="softurl1" id="softurl1" class="form-control d-inline-block w-75">
-									<div class="input-group-append"><span class="btn btn-success btn-send" onClick="SelectSoft('addcontent.softurl1')">选择</span></div>
+									<div class="input-group-append"><span class="btn btn-success btn-send" onclick="SelectSoft('addcontent.softurl1')">选择</span></div>
 								</div>
 								<label>下载名称：</label>
 								<input type="text" name="servermsg1" id="servermsg1" class="form-control" value="本地下载">
@@ -194,7 +194,7 @@
 				morelinkobj.style.display = "block";
 				if (endNum > 12) endNum = 12;
 				for (startNum; startNum <= endNum; startNum++) {
-					upfield.innerHTML += "<div class='form-group'><label>下载地址" + startNum + "：</label><div class='input-group mb-3'><input type='text' name='softurl" + startNum + "' value='http://' class='form-control'><div class='input-group-append'><span class='btn btn-success btn-send' onClick=\"SelectSoft('addcontent.softurl"+startNum+"')\">选择</span></div></div><label>下载名称" + startNum + "：</label><input type='text' name='servermsg" + startNum + "' class='form-control'></div>";
+					upfield.innerHTML += "<div class='form-group'><label>下载地址" + startNum + "：</label><div class='input-group mb-3'><input type='text' name='softurl" + startNum + "' value='http://' class='form-control'><div class='input-group-append'><span class='btn btn-success btn-send' onclick=\"SelectSoft('addcontent.softurl"+startNum+"')\">选择</span></div></div><label>下载名称" + startNum + "：</label><input type='text' name='servermsg" + startNum + "' class='form-control'></div>";
 				}
 			}
 			function ShowHideAddr() {

src/user/templets/soft_edit.htm

@@ -191,7 +191,7 @@
 				morelinkobj.style.display = "block";
 				if (endNum > 12) endNum = 12;
 				for (startNum; startNum <= endNum; startNum++) {
-					upfield.innerHTML += "<div class='form-group'><label>下载地址" + startNum + "：</label><div class='input-group mb-3'><input type='text' name='softurl" + startNum + "' value='http://' class='form-control'><div class='input-group-append'><span class='btn btn-success btn-send' onClick=\"SelectSoft('addcontent.softurl"+startNum+"')\">选择</span></div></div><label>下载名称" + startNum + "：</label><input type='text' name='servermsg" + startNum + "' class='form-control'></div>";
+					upfield.innerHTML += "<div class='form-group'><label>下载地址" + startNum + "：</label><div class='input-group mb-3'><input type='text' name='softurl" + startNum + "' value='http://' class='form-control'><div class='input-group-append'><span class='btn btn-success btn-send' onclick=\"SelectSoft('addcontent.softurl"+startNum+"')\">选择</span></div></div><label>下载名称" + startNum + "：</label><input type='text' name='servermsg" + startNum + "' class='form-control'></div>";
 				}
 			}
 			function ShowHideAddr() {