Merge pull request 'module_fix' (#34) from module_fix into develop

docs/changelog.md

@@ -1,6 +1,16 @@
 # 更新记录
 通过访问 https://www.dedebiz.com/git 获取完整更新记录
 
+# V6.2.10
+- 添加软件发布，演示网址上传压缩包解压功能；
+- 修正后台功能说明提示；
+- 修正兼容14px字体元素配置；
+- 修正模块上传侧边菜单插件栏目不显示问题；
+- 优化文档模型导入和文件上传及空间提示对话框；
+- 优化分类模型前台三级区分筛选显示；
+- 优化自带ckeditor富文本瘦身，更轻便简洁；
+- 其他常规问题修复；
+
 # V6.2.9
 - 常规问题修复；
   

src/admin/article_allowurl_edit.php

@@ -21,7 +21,7 @@ if ($dopost == 'save') {
     flock($fp, 3);
     fwrite($fp, $allurls);
     fclose($fp);
-    echo "<script>alert('已保存');</script>";
+    echo "<script>alert('成功保存站内链接');</script>";
 }
 //读出
 if (empty($allurls) && filesize($m_file) > 0) {

src/admin/article_source_edit.php

@@ -21,7 +21,7 @@ if ($dopost == 'save') {
     flock($fp, 3);
     fwrite($fp, $allsource);
     fclose($fp);
-    echo "<script>alert('已保存');</script>";
+    echo "<script>alert('成功保存文档来源');</script>";
 }
 //读出
 if (empty($allsource) && filesize($m_file) > 0) {

src/admin/article_string_mix.php

@@ -22,7 +22,7 @@ if ($dopost == "save") {
     flock($fp, 3);
     fwrite($fp, $allsource);
     fclose($fp);
-    echo "<script>alert('已保存');</script>";
+    echo "<script>alert('成功保存字符串混淆');</script>";
 }
 //读出
 if (empty($allsource) && filesize($m_file) > 0) {
@@ -36,7 +36,7 @@ $win = new OxWindow();
 $win->Init('article_string_mix.php', 'js/blank.js', 'POST');
 $win->AddHidden('dopost', 'save');
 $win->AddHidden('token', $_SESSION['token']);
-$win->AddTitle("<div class='alert alert-info mb-0'>启用字符串混淆来防采集功能，请在文档模板需要的字段加上function='RndString(@me)'属性，如：{dede:field name='body' function='RndString(@me)'/}</div>");
+$win->AddTitle("<div class='alert alert-info mb-0'>启用字符串混淆来防采集功能，文档模板需要的字段加上function='RndString(@me)'属性，如：{dede:field name='body' function='RndString(@me)'/}</div>");
 $win->AddMsgItem("<tr><td><textarea name='allsource' id='allsource' class='admin-textarea-xl'>$allsource</textarea></td></tr>");
 $winform = $win->GetWindow('ok');
 $win->Display();

src/admin/article_writer_edit.php

@@ -21,7 +21,7 @@ if ($dopost == "save") {
     flock($fp, 3);
     fwrite($fp, $allwriter);
     fclose($fp);
-    echo "<script>alert('已保存');</script>";
+    echo "<script>alert('成功保存文档作者');</script>";
 }
 //读出
 if (empty($allwriter) && filesize($m_file) > 0) {

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

@@ -59,7 +59,7 @@ if (empty($totalresult) && empty($keyword) && empty($orderby) && empty($flag)) {
     if (!empty($channelid) && empty($cid)) {
         $tinyQuerys[] = " channel = '$channelid' ";
     } else {
-        $tinyQuerys[] = " channel>0 ";
+        $tinyQuerys[] = " channel > 0 ";
     }
     if (!empty($arcrank)) {
         $tinyQuerys[] = " arcrank='$arcrank' ";
@@ -86,7 +86,7 @@ if (empty($totalresult) && empty($keyword) && empty($orderby) && empty($flag)) {
 }
 if ($cid == 0) {
     if ($channelid == 0) {
-        $positionname = '所有栏目>';
+        $positionname = '所有栏目 - ';
     } else {
         $row = $tl->dsql->GetOne("SELECT id,typename,maintable FROM `#@__channeltype` WHERE id='$channelid'");
         $positionname = $row['typename']." - ";

src/admin/dialog/select_images.php

@@ -59,18 +59,17 @@ if (!empty($iseditor)) {
         <link rel="stylesheet" href="../../static/web/font/css/font-awesome.min.css">
         <link rel="stylesheet" href="../../static/web/css/bootstrap.min.css">
         <link rel="stylesheet" href="../../static/web/css/admin.css">
-        <style>body{background:#f5f5f5}.upload-bg{margin:10px;background:#fff;border-radius:.5rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.napisdiv{left:10;top:10;width:150px;height:100px;position:absolute;z-index:9998;display:none}</style>
         <script src="../js/float.js"></script>
     </head>
-    <body>
-        <div class="upload-bg">
+    <body class="body-bg">
+        <div class="upload-bg shadow-sm">
             <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>
             </div>
             <table align="center" class="table icon">
                 <tr>
                     <td colspan="3">
-                        <form action="select_images_post.php" method="POST" enctype="multipart/form-data" name="myform">
+                        <form name="myform" action="select_images_post.php" method="POST" enctype="multipart/form-data">
                             <?php $noeditor = !empty($noeditor) ? "<input type='hidden' name='noeditor' value='yes'>" : ''; echo $noeditor;?>
                             <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
                             <input type="hidden" name="f" value="<?php echo $f ?>">

src/admin/dialog/select_media.php

@@ -49,14 +49,13 @@ if (!empty($noeditor)) {
         <link rel="stylesheet" href="../../static/web/font/css/font-awesome.min.css">
         <link rel="stylesheet" href="../../static/web/css/bootstrap.min.css">
         <link rel="stylesheet" href="../../static/web/css/admin.css">
-        <style>body{background:#f5f5f5}.upload-bg{margin:10px;background:#fff;border-radius:.5rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}</style>
     </head>
-    <body>
-        <div class="upload-bg">
+    <body class="body-bg">
+        <div class="upload-bg shadow-sm">
             <table align="center" class="table icon">
                 <tr>
                     <td colspan="3">
-                        <form action="select_media_post.php" method="POST" enctype="multipart/form-data" name="myform">
+                        <form name="myform" action="select_media_post.php" method="POST" enctype="multipart/form-data">
                             <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
                             <input type="hidden" name="f" value="<?php echo $f ?>">
                             <input type="hidden" name="job" value="upload">

src/admin/dialog/select_mimages.php

@@ -26,11 +26,13 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
     	<ul id="file_list"></ul>
     </div>
     <script>
-    	var axupimgs={};
+    	var axupimgs = {};
     	axupimgs.res = [];//存放本地文件的数组
     	var blobInfo = {file:null}
-    	blobInfo.blob = function(){return this.file;}
-    	var upload_handler = async(blobInfo, succFun, failFun)=>{
+    	blobInfo.blob = function() {
+            return this.file;
+        }
+    	var upload_handler = async(blobInfo, succFun, failFun) => {
             var file = blobInfo.blob();
             formData = new FormData();
             formData.append('upload', file, file.name);
@@ -53,8 +55,8 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
         };
     	var upload_base_path = axupimgs.images_upload_base_path;
     	//为列表添加排序
-    	function reSort(){
-            document.querySelectorAll('#file_list li').forEach((el,i)=>{
+    	function reSort() {
+            document.querySelectorAll('#file_list li').forEach((el,i) => {
                 el.setAttribute('data-num',i);
             });
     	}
@@ -82,40 +84,46 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
             //reSort();
         }
         //清空列表
-        document.querySelector('#topbar .removeall').addEventListener('click',()=>{
+        document.querySelector('#topbar .removeall').addEventListener('click',() => {
             axupimgs.res=[]
-            document.querySelectorAll('#file_list li').forEach((el,i)=>{
+            document.querySelectorAll('#file_list li').forEach((el,i) => {
                 el.parentNode.removeChild(el)
             });
         });
         //拖拽添加
-        document.addEventListener('dragover', (e)=>{
+        document.addEventListener('dragover', (e) => {
             e.stopPropagation();
             e.preventDefault();
             e.dataTransfer.dropEffect = 'copy';
         });
-        document.addEventListener('drop', (e)=>{
+        document.addEventListener('drop', (e) => {
             e.stopPropagation();
             e.preventDefault();
-            if (!e.dataTransfer.files){return false;}
+            if (!e.dataTransfer.files) {
+                return false;
+            }
             var dropfiles = e.dataTransfer.files;
-            if (!(dropfiles.length>0)){return false;}
+            if (!(dropfiles.length > 0)) {
+                return false;
+            }
             var exts='.png,.gif,.jpg,.jpeg'.replace(/(\s)+/g,'').toLowerCase().split(',');
             var files=[];
             for ( let file of dropfiles ) {
                 ext = file.name.split('.');
                 ext = '.'+ext[ext.length-1];
                 for (let s of exts) {
-                    if (s==ext){
+                    if (s==ext) {
                         files.push(file);
                         break;
                     }
                 }
             }
-            if (files.length>0){ addList(files) }
+            if (files.length > 0) {
+                addList(files)
+            }
         });
         //添加文件
-        document.querySelector('#topbar .addfile').addEventListener('click',()=>{
+        document.querySelector('#topbar .addfile').addEventListener('click',() => {
             var input = document.createElement('input');
             input.setAttribute('type', 'file');
             input.setAttribute('multiple', 'multiple');
@@ -127,31 +135,31 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
             }
         });
     	var file_i = 0;
-    	function upAllFiles(n){
+    	function upAllFiles(n) {
     		var len = axupimgs.res.length;
     		file_i = n;
-    		if (len == n){
+    		if (len == n) {
     			file_i=0;
                 document.querySelector('#topbar .upall').innerText='全部上传';
                 //返回
-                axupimgs.res.forEach((v,k)=>{
-                    let addonHTML = `<img src='${v.url}'/>`;
+                axupimgs.res.forEach((v,k) => {
+                    let addonHTML = `<img src='${v.url}'>`;
                     window.opener.CKEDITOR.instances["<?php echo $f ?>"].insertHtml(addonHTML);
                 })
                 window.close();
     			return true;
     		}
-    		if ( axupimgs.res[n].url!='' ){
+    		if (axupimgs.res[n].url!='') {
     			n++;
     			upAllFiles(n)
     		} else {
     			blobInfo.file=axupimgs.res[n].file;
                 blobInfo.isWater = document.querySelector('#isWater').checked;
-    			upload_handler(blobInfo,function(url){
-    				if (upload_base_path){
-    					if (upload_base_path.slice(-1)=='/' && url.substr(0,1)=='/' ){
+    			upload_handler(blobInfo,function(url) {
+    				if (upload_base_path) {
+    					if (upload_base_path.slice(-1)=='/' && url.substr(0,1)=='/') {
     						url = upload_base_path + url.slice(1);
-    					}else if (upload_base_path.slice(-1)!='/' && url.substr(0,1)!='/' ){
+    					} else if (upload_base_path.slice(-1)!='/' && url.substr(0,1)!='/') {
     						url = upload_base_path + '/' + url;
     					} else {
     						url = upload_base_path + url;
@@ -164,29 +172,31 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
     				li.querySelector('.namebox span').innerText = filename;
     				n++
     				upAllFiles(n);
-    			},function(err){
+    			},function(err) {
                     document.querySelector('#topbar .upall').innerText='全部上传';
-                    document.querySelectorAll('#file_list li.up-now').forEach((el,i)=>{
+                    document.querySelectorAll('#file_list li.up-now').forEach((el,i) => {
                         el.setAttribute('class','up-no');
                     });
                     alert(err);
                 });
     		}	
     	}
-        document.querySelector('#topbar .upall').addEventListener('click',(e)=>{
-            if (e.target.innerText!='全部上传'){return false;}
-            if (axupimgs.res.length>0){
-                document.querySelectorAll('#file_list li.up-no').forEach((el,i)=>{
+        document.querySelector('#topbar .upall').addEventListener('click',(e) => {
+            if (e.target.innerText!='全部上传') {
+                return false;
+            }
+            if (axupimgs.res.length > 0) {
+                document.querySelectorAll('#file_list li.up-no').forEach((el,i) => {
                     el.classList ? el.classList.add('up-now') : el.className+=' up-now';
                 });
                 e.target.innerText='上传中';
                 upAllFiles(0);
             }
         });
-        var observ_flist = new MutationObserver( (muList,observe)=>{
-            if (muList[0].addedNodes.length>0){
-                muList[0].addedNodes.forEach((el)=>{
-                    el.querySelector('.remove').addEventListener('click',(e)=>{
+        var observ_flist = new MutationObserver( (muList,observe) => {
+            if (muList[0].addedNodes.length > 0) {
+                muList[0].addedNodes.forEach((el) => {
+                    el.querySelector('.remove').addEventListener('click',(e) => {
                         var li = e.target.parentNode.parentNode;
                         var n = li.getAttribute('data-num');
                         var el = document.querySelectorAll('#file_list li')[n];

src/admin/dialog/select_soft.php

@@ -48,14 +48,13 @@ if (!empty($noeditor)) {
         <link rel="stylesheet" href="../../static/web/font/css/font-awesome.min.css">
         <link rel="stylesheet" href="../../static/web/css/bootstrap.min.css">
         <link rel="stylesheet" href="../../static/web/css/admin.css">
-        <style>body{background:#f5f5f5}.upload-bg{margin:10px;background:#fff;border-radius:.5rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}</style>
     </head>
-    <body>
-        <div class="upload-bg">
+    <body class="body-bg">
+        <div class="upload-bg shadow-sm">
             <table align="center" class="table icon">
                 <tr>
                     <td colspan="3">
-                        <form action="select_soft_post.php" method="POST" enctype="multipart/form-data" name="myform">
+                        <form name="myform"  action="select_soft_post.php" method="POST" enctype="multipart/form-data">
                             <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
                             <input type="hidden" name="f" value="<?php echo $f ?>">
                             <input type="hidden" name="job" value="upload">

src/admin/dialog/select_templets.php

@@ -40,14 +40,13 @@ if (empty($comeback)) {
         <link rel="stylesheet" href="../../static/web/font/css/font-awesome.min.css">
         <link rel="stylesheet" href="../../static/web/css/bootstrap.min.css">
         <link rel="stylesheet" href="../../static/web/css/admin.css">
-        <style>body{background:#f5f5f5}.upload-bg{margin:10px;background:#fff;border-radius:.5rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}</style>
     </head>
-    <body>
-        <div class="upload-bg">
+    <body  class="body-bg">
+        <div class="upload-bg shadow-sm">
             <table align="center" class="table icon">
                 <tr>
                     <td colspan="3">
-                        <form action="select_templets_post.php" method="POST" enctype="multipart/form-data" name="myform">
+                        <form name="myform" action="select_templets_post.php" method="POST" enctype="multipart/form-data">
                             <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
                             <input type="hidden" name="f" value="<?php echo $f ?>">
                             <input type="hidden" name="job" value="upload">

src/admin/file_manage_control.php

@@ -54,7 +54,7 @@ else if ($fmdo == "edit") {
     if (empty($backurl)) {
         ShowMsg("成功保存一个文件", "file_manage_main.php?activepath=$activepath");
     } else {
-        ShowMsg("成功保存文件", $backurl);
+        ShowMsg("成功保存一个文件", $backurl);
     }
     exit();
 }
@@ -87,7 +87,7 @@ else if ($fmdo == "upload") {
             $j++;
         }
     }
-    ShowMsg("成功上传<span class='text-primary'>$j</span>个文件到: $activepath", "file_manage_main.php?activepath=$activepath");
+    ShowMsg("成功上传<span class='text-primary'>$j</span>个文件到<span class='text-primary'>$activepath</span>", "file_manage_main.php?activepath=$activepath");
     exit();
 }
 //空间检查
@@ -97,9 +97,8 @@ else if ($fmdo == "space") {
     } else {
         $ecpath = $activepath;
     }
-    $titleinfo = "[<a href='file_manage_main.php?activepath=$activepath'>$ecpath</a>]空间使用状况：<br>";
-    $wintitle = "检查空间大小";
-    $wecome_info = "<a href='file_manage_main.php?activepath=$activepath'>文件管理</a> - 空间大小";
+    $wintitle = "指定空间检查大小";
+    $wecome_info = "文件管理器 - <a href='file_manage_main.php?activepath=$activepath'>$ecpath</a>空间检查大小";
     $activepath = $cfg_basedir.$activepath;
     $space = new SpaceUse;
     $space->checksize($activepath);
@@ -108,8 +107,16 @@ else if ($fmdo == "space") {
     $totalmb = $space->setmb($total);
     $win = new OxWindow();
     $win->Init("", "js/blank.js", "POST");
-    $win->AddTitle($titleinfo);
-    $win->AddMsgItem("<tr><td>$totalmb M<br>$totalkb KB<br>$total 字节</td></tr>");
+    $win->AddMsgItem("<tr>
+        <td>
+            <span>$totalkb</span>KB<br>
+            <span>$totalmb</span>M<br>
+            <span>$total</span>字节
+        </td>
+    </tr>
+    <tr>
+        <td bgcolor='#f5f5f5' align='center'><button type='button' class='btn btn-success btn-sm' onclick=\"location='file_manage_main.php';\">文件管理器</button></td>
+    </tr>");
     $winform = $win->GetWindow("");
     $win->Display();
 }

src/admin/media_main.php

@@ -29,9 +29,9 @@ if (empty($membertype)) {
     $membertype = 0;
 }
 if ($membertype == 1) {
-    $addsql .= " AND u.mid>0 ";
+    $addsql .= " AND u.mid > 0 ";
 } else if ($membertype == 2) {
-    $addsql .= " AND u.mid>0 ";
+    $addsql .= " AND u.mid > 0 ";
 }
 
 if (empty($mediatype)) {

src/admin/member_main.php

@@ -24,7 +24,7 @@ $sortkey = empty($sortkey) ? 'mid' : preg_replace("#[^a-z]#i", '', $sortkey);
 $staArr = array(-2 => '限制禁言会员', -1 => '未通过审核', 0 => '审核通过需要填写信息', 1 => '待补充完善信息', 2 => '正常使用');
 $staArrmatt = array(1 => '被推荐', 0 => '非普通 ');
 $MemberTypes = array();
-$dsql->SetQuery("SELECT `rank`,membername From `#@__arcrank` where `rank`>0 ");
+$dsql->SetQuery("SELECT `rank`,membername FROM `#@__arcrank` WHERE `rank` > 0 ");
 $dsql->Execute();
 while ($row = $dsql->GetObject()) {
     $MemberTypes[$row->rank] = $row->membername;

src/admin/mychannel_edit.php

@@ -133,7 +133,7 @@ if ($dopost == "show") {
         <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>
+        <td bgcolor='#f5f5f5' 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) {
@@ -145,7 +145,7 @@ if ($dopost == "show") {
             <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>
+            <td bgcolor='#f5f5f5' align='center'><button type='button' class='btn btn-success btn-sm' onclick=\"location='mychannel_main.php';\">文档模型管理</button></td>
         </tr>");
     }
     //正常的导入过程
@@ -156,7 +156,7 @@ if ($dopost == "show") {
             <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>
+            <td bgcolor='#f5f5f5' align='center'><button type='button' class='btn btn-success btn-sm' onclick=\"location='mychannel_main.php';\">文档模型管理</button></td>
         </tr>");
     }
     //创建表
@@ -176,7 +176,7 @@ if ($dopost == "show") {
             <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>
+            <td bgcolor='#f5f5f5' align='center'><button type='button' class='btn btn-success btn-sm' onclick=\"location='mychannel_main.php';\">文档模型管理</button></td>
         </tr>");
         exit();
     }
@@ -196,7 +196,7 @@ if ($dopost == "show") {
         <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>
+        <td bgcolor='#f5f5f5' 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", "<", ">");
@@ -226,7 +226,7 @@ if ($dopost == "show") {
         <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>
+        <td bgcolor='#f5f5f5' 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);

src/admin/soft_config.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 系统设置
+ * 软件下载设置
  *
  * @version        $id:soft_config.php 16:09 2010年7月20日 tianya $
  * @package        DedeBIZ.Administrator
@@ -16,7 +16,7 @@ if ($dopost == "save") {
     if ($dfrank > 0 || $dfywboy > 0) $gotojump = 1;
     $query = "UPDATE `#@__softconfig` SET `downtype`='$downtype',`gotojump`='$gotojump',`ismoresite`='$ismoresite',`islocal`='$islocal',`sites`='$sites',`moresitedo`='$moresitedo',`dfrank`='$dfrank',`dfywboy`='$dfywboy',`argrange`='$argrange',downmsg='$downmsg' ";
     $dsql->ExecuteNoneQuery($query);
-    ShowMsg('成功保存参数', 'soft_config.php');
+    ShowMsg('成功保存软件下载设置', 'soft_config.php');
     exit();
 }
 //读取参数

src/admin/soft_edit.php

@@ -48,8 +48,8 @@ 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>';
-                    $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";
+                    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++;
                 }
             }
@@ -171,7 +171,7 @@ if ($dopost != 'save') {
             if ($servermsg == '') {
                 $servermsg = '下载地址'.$i;
             }
-            if ($softurl != 'http://') {
+            if ($softurl != '') {
                 if ($islocal == 1) $urls .= "{dede:link islocal='$islocal' text='{$servermsg}'} $softurl {/dede:link}\r\n";
                 else if ($isneed) $urls .= "{dede:link text='$servermsg'} $softurl {/dede:link}\r\n";
                 else continue;

src/admin/sys_data_replace.php

@@ -23,7 +23,7 @@ else if ($action == 'getfields') {
     AjaxHead();
     $dsql->GetTableFields($exptable);
     echo "<div class='alert alert-info mb-0'>";
-    echo "表<span class='text-primary'>".$exptable."</span>含有的字段：<br>";
+    echo "<p>表<span class='text-primary'>".$exptable."</span>含有的字段：</p>";
     while ($row = $dsql->GetFieldObject()) {
         echo "<a href=\"javascript:pf('{$row->name}')\">".$row->name."</a>\r\n";
     }
@@ -35,7 +35,7 @@ else if ($action == 'apply') {
     $validate = empty($validate) ? '' : strtolower($validate);
     $svali = GetCkVdValue();
     if ($validate == "" || $validate != $svali) {
-        ShowMsg("安全确认码不正确", "javascript:;");
+        ShowMsg("验证码不正确", "javascript:;");
         exit();
     }
     if ($exptable == '' || $rpfield == '') {

src/admin/templets/ad_add.htm

@@ -14,7 +14,7 @@
 		<style>.typetab{text-align:left}.typetab ul li{float:left;width:60px;height:28px;line-height:28px;border-radius:.5rem .5rem 0 0;text-align:center;cursor:pointer}.typetab ul .act{background:#f5f5f5}</style>
 	</head>
 	<body>
-		<form action="ad_add.php" method="post" name="form1" onSubmit="return checkSubmit()">
+		<form name="form1" action="ad_add.php" method="post" onSubmit="return checkSubmit()">
 			<input type="hidden" name="normbody[style]" value="code" id="adstyle">
 			<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
 			<input type="hidden" name="dopost" value="save">

src/admin/templets/ad_edit.htm

@@ -13,7 +13,7 @@
 		<script src="../static/web/js/daterangepicker.js"></script>
 	</head>
 	<body>
-		<form action="ad_edit.php" method="post" enctype="multipart/form-data" name="form1">
+		<form name="form1" action="ad_edit.php" method="post" enctype="multipart/form-data">
 			<input type="hidden" name="aid" value="<?php echo $aid?>">
 			<input type="hidden" name="dopost" value="saveedit">
 			<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">

src/admin/templets/ad_main.htm

@@ -10,7 +10,7 @@
 		<link rel="stylesheet" href="../static/web/css/admin.css">
 	</head>
 	<body>
-		<form action="ad_main.php" method="get" name="form3" id="form3">
+		<form name="form3" action="ad_main.php" method="get" id="form3">
 			<input type="hidden" name="dopost" value="listArchives">
 			<table align="center" class="table maintable my-3">
 				<tr bgcolor="#f5f5f5">

src/admin/templets/album_add.htm

@@ -314,7 +314,7 @@
 								<td width="120">标题颜色：</td>
 								<td>
 									<input type="text" name="color" id="color" class="admin-input-sm">
-									<button type="button" name="modcolor" id="modcolor" class="btn btn-success btn-sm" onclick="ShowColor(event,this)">选取</button>
+									<button type="button" name="modcolor" id="modcolor" class="btn btn-success btn-sm" onclick="ShowColor(event,this)">选择</button>
 								</td>
 							</tr>
 						</table>

src/admin/templets/album_edit.htm

@@ -353,7 +353,7 @@
 								<td width="120">标题颜色：</td>
 								<td>
 									<input type="text" name="color" id="color" value="<?php echo $arcRow['color']?>" class="admin-input-sm">
-									<button type="button" name="modcolor" id="modcolor" class="btn btn-success btn-sm" onclick="ShowColor(event,this)">选取</button>
+									<button type="button" name="modcolor" id="modcolor" class="btn btn-success btn-sm" onclick="ShowColor(event,this)">选择</button>
 								</td>
 							</tr>
 						</table>

src/admin/templets/archives_add.htm

@@ -247,7 +247,7 @@
 								<td width="120">标题颜色：</td>
 								<td>
 									<input type="text" name="color" id="color" class="admin-input-sm">
-									<button type="button" name="modcolor" id="modcolor" onclick="ShowColor(event,this)" class="btn btn-success btn-sm">选取</button>
+									<button type="button" name="modcolor" id="modcolor" onclick="ShowColor(event,this)" class="btn btn-success btn-sm">选择</button>
 								</td>
 							</tr>
 						</table>

src/admin/templets/archives_edit.htm

@@ -239,7 +239,7 @@
 								<td width="120">标题颜色：</td>
 								<td>
 									<input name="color" type="text" id="color" value="<?php echo $arcRow['color']?>" class="admin-input-sm">
-									<button name="modcolor" type="button" id="modcolor" class="btn btn-success btn-sm" onclick="ShowColor(event,this)">选取</button>
+									<button name="modcolor" type="button" id="modcolor" class="btn btn-success btn-sm" onclick="ShowColor(event,this)">选择</button>
 								</td>
 							</tr>
 						</table>

src/admin/templets/article_add.htm

@@ -256,7 +256,7 @@
 								<td width="120">标题颜色：</td>
 								<td>
 									<input type="text" name="color" id="color" class="admin-input-sm">
-									<button type="button" name="modcolor" id="modcolor" class="btn btn-success btn-sm" onclick="ShowColor(event, this)">选取</button>
+									<button type="button" name="modcolor" id="modcolor" class="btn btn-success btn-sm" onclick="ShowColor(event, this)">选择</button>
 								</td>
 							</tr>
 						</table>

src/admin/templets/article_edit.htm

@@ -239,7 +239,7 @@
 								<td width="120">标题颜色：</td>
 								<td>
 									<input name="color" type="text" id="color" value="<?php echo $arcRow['color']?>" class="admin-input-sm">
-									<button name="modcolor" type="button" id="modcolor" onclick="ShowColor(event,this)" class="btn btn-success btn-sm">选取</button>
+									<button name="modcolor" type="button" id="modcolor" onclick="ShowColor(event,this)" class="btn btn-success btn-sm">选择</button>
 								</td>
 							</tr>
 						</table>

src/admin/templets/catalog_add.htm

@@ -112,12 +112,12 @@
 				</tr>
 				<tr>
 					<td>排列顺序：</td>
-					<td><input type="text" name="sortrank" class="admin-input-sm">（由低 > 高）</td>
+					<td><input type="text" name="sortrank" class="admin-input-sm">（由低到高）</td>
 					<td>浏览权限：</td>
 					<td>
 						<select name="corank" id="corank" class="admin-input-sm">
 							<?php
-							$dsql->SetQuery("SELECT * FROM `#@__arcrank` where `rank` >= 0 ORDER BY `rank` ASC");
+							$dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE `rank` >= 0 ORDER BY `rank` ASC");
 							$dsql->Execute('cc');
 							while($row = $dsql->GetObject('cc')) {
 								if ($corank==$row->rank) echo "<option value='".$row->rank."' selected>".$row->membername."</option>";
@@ -171,7 +171,7 @@
 						<label class="l-height-28"><input type="radio" name="cross" id="cross2" value="2" onclick="CheckCross()"> 指定交叉栏目id（英文逗号分开）</label>
 						<span onclick="ShowHide('helpvarco')" title="帮助" class="btn btn-success btn-sm"><i class="fa fa-question-circle"></i></span><br>
 						<textarea name="crossid" id="crossid" class="admin-textarea-sm" style="display:none"></textarea>
-						<div id="helpvarco" class="alert alert-info my-2" style="display:none">交叉栏目是指一个大栏目与另一个非下级的子栏目出现交叉的情况，相当于系统原来的副栏目功能，不过现在改在栏目里预先设置好。注：会自动索引交叉栏目的文档，但不会索引交叉栏目下级栏目的文档，这种应用也适用于按地区划分资讯的站点</div>
+						<div id="helpvarco" class="alert alert-info my-2" style="display:none">交叉栏目是大栏目与另一个非子栏目交叉的情况，相当于副栏目功能，需要在栏目里设置好</div>
 					</td>
 				</tr>
 				<?php if ($id==0) {?>
@@ -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>
@@ -295,6 +295,14 @@
 				else if (window.navigator.userAgent.indexOf("Firefox") >= 1) return 'FF';
 				else return "OT";
 			}
+			function checkSubmit() {
+				if (document.form1.typename.value == "") {
+					alert("栏目名称不能为空");
+					document.form1.typename.focus();
+					return false;
+				}
+				return true;
+			}
 			function SelectTemplets(fname) {
 				var pos = GetWinPos(800,600);
 				window.open("./dialog/select_templets.php?f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top);
@@ -341,14 +349,6 @@
 					tobj.style.display = "none";
 				}
 			}
-			function checkSubmit() {
-				if (document.form1.typename.value == "") {
-					alert("栏目名称不能为空");
-					document.form1.typename.focus();
-					return false;
-				}
-				return true;
-			}
 			function CheckPathSet() {
 				var surl = document.getElementById("siteurl");
 				var sreid = document.getElementById("reid");

src/admin/templets/catalog_edit.htm

@@ -108,12 +108,12 @@
 				</tr>
 				<tr>
 					<td>排列顺序：</td>
-					<td><input type="text" name="sortrank" value="<?php echo $myrow['sortrank']?>" class="admin-input-sm">（由低 > 高）</td>
+					<td><input type="text" name="sortrank" value="<?php echo $myrow['sortrank']?>" class="admin-input-sm">（由低到高）</td>
 					<td>浏览权限：</td>
 					<td>
 						<select name="corank" id="corank" class="admin-input-sm">
 							<?php
-							$dsql->SetQuery("SELECT * FROM `#@__arcrank` where `rank` >= 0 ORDER BY `rank` ASC");
+							$dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE `rank` >= 0 ORDER BY `rank` ASC");
 							$dsql->Execute('cc');
 							while($row = $dsql->GetObject('cc'))
 							{
@@ -157,7 +157,7 @@
 						<label class="l-height-28"><input type="radio" name="cross" id="cross2" value="2" onclick="CheckCross()" <?php if ($myrow['cross']==2) echo "checked='checked'";?>> 指定交叉栏目id（英文逗号分开）</label>
 						<span onclick="ShowHide('helpvarco')" title="帮助" class="btn btn-success btn-sm"><i class="fa fa-question-circle"></i></span><br>
 						<textarea name="crossid" id="crossid" class="admin-textarea-sm" style="<?php if ($myrow['cross']!=2) echo'display:none';?>"><?php echo $myrow['crossid'];?></textarea>
-						<div id="helpvarco" class="alert alert-info my-2" style="display:none">交叉栏目是指一个大栏目与另一个非下级的子栏目出现交叉的情况，相当于系统原来的副栏目功能，不过现在改在栏目里预先设置好。注：会自动索引交叉栏目的文档，但不会索引交叉栏目下级栏目的文档，这种应用也适用于按地区划分资讯的站点</div>
+						<div id="helpvarco" class="alert alert-info my-2" style="display:none">交叉栏目是大栏目与另一个非子栏目交叉的情况，相当于副栏目功能，需要在栏目里设置好</div>
 					</td>
 				</tr>
 				<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>
@@ -326,6 +326,14 @@
 				else if (window.navigator.userAgent.indexOf("Firefox") >= 1) return 'FF';
 				else return "OT";
 			}
+			function checkSubmit() {
+				if (document.form1.typename.value == "") {
+					alert("栏目名称不能为空");
+					document.form1.typename.focus();
+					return false;
+				}
+				return true;
+			}
 			function SelectTemplets(fname) {
 				var pos = GetWinPos(800,600);
 				window.open("./dialog/select_templets.php?f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top);
@@ -372,14 +380,6 @@
 					tobj.style.display = "none";
 				}
 			}
-			function checkSubmit() {
-				if (document.form1.typename.value == "") {
-					alert("栏目名称不能为空");
-					document.form1.typename.focus();
-					return false;
-				}
-				return true;
-			}
 			function CheckCross() {
 				var cross2 = document.getElementById('cross2');
 				var crossid = document.getElementById('crossid');

src/admin/templets/content_att.htm

@@ -17,7 +17,7 @@
 				</tr>
 				<tr>
 					<td colspan="3">
-						<div class="alert alert-info mb-0">自定义属性使用说明：以往的版本中，网站首页、封面栏目的设计，都只能单调的用arclist标记把某栏目最新或按特定排序方式的文档无选择的读出来，这样做法存在很大的不足，例如，我希望在最顶部的地方显示我想要的文档，在以往的版本中是无法做到的，但使用自定义属性之后，只要给arclist标记加上att='自定义属性的id'的属性，然后在发布的时候对适合的文档选择专门的属性，那么使用arclist的地方就会按您的意愿显示指定的文档。注意事项：这个版本中att对应的字段是SET类型字段，因此为了数据安全起见不允许会员添加其它类型，但调用时允许使用组合条件att='c,p'表示推荐图片</div>
+						<div class="alert alert-info mb-0">自定义属性说明：文档发布时选择属性后arclist标签加上flag='自定义属性'，例：{dede:arclist flag='h,c'}，h,c表示组合属性头条和推荐</div>
 					</td>
 				</tr>
 				<tr bgcolor="#e9ecef" align="center">

src/admin/templets/diy_add.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-		<title>新增自定义表单</title>
+		<title>添加自定义表单</title>
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/css/admin.css">
@@ -15,7 +15,7 @@
 		<form name="form1" action="diy_add.php?action=add" method="post" onSubmit="return checkSubmit();">
 			<table align="center" class="table maintable my-3">
 				<tr>
-					<td bgcolor="#f5f5f5" colspan="2"><a href="diy_main.php">自定义表单管理</a> - 新增自定义表单</td>
+					<td bgcolor="#f5f5f5" colspan="2"><a href="diy_main.php">自定义表单管理</a> - 添加自定义表单</td>
 				</tr>
 				<tr>
 					<td width="260">自定义表单id：</td>

src/admin/templets/diy_edit.htm

@@ -78,8 +78,8 @@
 							$dtp->SetNameSpace("field","<",">");
 							$dtp->LoadSource($fieldset);
 							if (is_array($dtp->CTags)){
-							foreach($dtp->CTags as $ctag)
-							{
+								foreach($dtp->CTags as $ctag)
+								{
 							?>
 							<tr align="center">
 								<td>
@@ -100,8 +100,8 @@
 								<td>
 									<?php 
 									$ft = $ctag->GetAtt('autofield');
-									if ($ft==''||$ft==0) echo "固化表单";
-									else  echo "自动表单";
+									if ($ft==''||$ft==0) echo "固化字段";
+									else  echo "自动字段";
 									?>
 								</td>
 								<td>

src/admin/templets/diy_edit_content.htm

@@ -7,8 +7,6 @@
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/css/admin.css">
-		<script src="../static/web/js/jquery.min.js"></script>
-		<script src="../static/web/js/bootstrap.min.js"></script>
 	</head>
 	<body>
 		<form name="form1" method="post" enctype="multipart/form-data" action="diy_list.php?action=edit&diyid=<?php echo $diy->diyid ?>&id=<?php echo $row['id'] ?>&do=2">
@@ -26,7 +24,7 @@
 					if ($row[$field]=='') continue;
 					if (!in_array($fielddata[1],$allowhtml)) {
 						$row[$field] = dede_htmlspecialchars($row[$field]);
-						$row[$field] = "<input type='text' name='".$field."' value='".$row[$field]."'>";
+						$row[$field] = "<textarea name='".$field."' class='admin-textarea-xl'>$row[$field]</textarea>";
 					}
 					echo '<tr><td width="260">'.$fielddata[0].'：'.'</td><td>'.$row[$field].'</td></tr>';
 					$formfields .= 	$formfields == ''? $field.','.$fielddata[1] : ';'.$field.','.$fielddata[1];	

src/admin/templets/diy_field_add.htm

@@ -23,7 +23,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-danger mb-0">修改时禁止输入双引号["]，则表单保存失败</div>
+						<div class="alert alert-danger mb-0">修改文档模型字段时禁止输入双引号"</div>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/diy_main.htm

@@ -34,7 +34,7 @@
 			</tr>
 			{/dede:datalist}
 			<tr>
-				<td colspan="4"><a href="diy_add.php" class="btn btn-success btn-sm ml-2">添加新的自定义表单</a></td>
+				<td colspan="4"><a href="diy_add.php" class="btn btn-success btn-sm ml-2">添加自定义表单</a></td>
 			</tr>
 			<tr>
 				<td colspan="4" bgcolor="#f5f5f5" align="center">{dede:pagelist listsize='6'/}</td>

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/freelist_add.htm

@@ -30,7 +30,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-info mb-0">自由列表标记说明：自由列表标记（freelist）的功能基本等同于arclist标记，区别是freelist标记支持分页，这让生成按自定义排序规则的文档列表（如按标题拼音部首排序等）等轻松的实现统一化管理，并且自由列是独立编译的，不与其它模板混在一起，这样不会影响系统生成网页或浏览速度</div>
+						<div class="alert alert-info mb-0">自由列表说明：freelist功能基本等同于arclist标签，区别是freelist标签支持分页，按自定义排序规则的文档列表（如按标题拼音部首排序等）等轻松的实现统一化管理，并且自由列是独立编译的，不与其它模板混在一起，不会影响系统生成网页或浏览速度</div>
 					</td>
 				</tr>
 				<tr>
@@ -97,7 +97,7 @@
 						<?php
 						echo "<select name='typeid' class='admin-input-sm'>";
 						echo "<option value='0'>不限栏目</option>";
-						$dsql->SetQuery("Select ID,typename, channeltype From `#@__arctype`");
+						$dsql->SetQuery("SELECT id,typename, channeltype FROM `#@__arctype`");
 						$dsql->Execute();
 						while($lrow = $dsql->GetObject()){
 							$disable = '';
@@ -112,7 +112,7 @@
 						<?php
 						echo "<select name='channel' class='admin-input-sm'>";
 						echo "<option value='0' selected>不限模型</option>";
-						$dsql->SetQuery("Select ID,typename From `#@__channeltype` where ID>0");
+						$dsql->SetQuery("SELECT id,typename FROM `#@__channeltype` WHERE id > 0");
 							$dsql->Execute();
 							while($row = $dsql->GetObject())
 							{

src/admin/templets/freelist_edit.htm

@@ -28,7 +28,7 @@
 
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-info mb-0">自由列表标记说明：自由列表标记（freelist）的功能基本等同于arclist标记，区别是freelist标记支持分页，这让生成按自定义排序规则的文档列表（如按标题拼音部首排序等）等轻松的实现统一化管理，并且自由列是独立编译的，不与其它模板混在一起，这样不会影响系统生成网页或浏览速度</div>
+						<div class="alert alert-info mb-0">自由列表说明：freelist功能基本等同于arclist标签，区别是freelist标签支持分页，按自定义排序规则的文档列表（如按标题拼音部首排序等）等轻松的实现统一化管理，并且自由列是独立编译的，不与其它模板混在一起，不会影响系统生成网页或浏览速度</div>
 					</td>
 				</tr>
 				<tr>
@@ -76,7 +76,7 @@
 						$typeid = $ctag->GetAtt('typeid');
 						echo "<select name='typeid' class='admin-input-sm'>";
 						echo "<option value='0'>不限栏目</option>";
-						$dsql->SetQuery("Select id,typename, channeltype From `#@__arctype`");
+						$dsql->SetQuery("SELECT id,typename, channeltype FROM `#@__arctype`");
 						$dsql->Execute();
 						while($lrow = $dsql->GetObject()){
 							$disable = '';
@@ -93,7 +93,7 @@
 						<?php
 						$channel  = $ctag->GetAtt('channel');
 						echo "<select name='channel' class='admin-input-sm'><option value='0'>不限模型</option>";
-						$dsql->SetQuery("Select id,typename From `#@__channeltype` where id>0");
+						$dsql->SetQuery("SELECT id,typename FROM `#@__channeltype` WHERE id > 0");
 						$dsql->Execute();
 						while($nrow = $dsql->GetObject())
 						{

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_spec.htm

@@ -17,7 +17,7 @@
 				</tr>
 				<tr>
 					<td>
-						<div class="alert alert-info mb-0">为了安全起见，专题目录建议设置仅可读写权限，发布专题后需要手动更新，默认文件为：<?php echo $cfg_cmspath.$cfg_special."/index.html"?></div>
+						<div class="alert alert-info mb-0">更新专题说明：发布专题后需要手动更新，建议专题目录设置仅可读写权限，存放目录：<?php echo $cfg_cmspath.$cfg_special."/index.html"?></div>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/member_edit.htm

@@ -19,7 +19,7 @@
 				<tr>
 					<td bgcolor="#f5f5f5" colspan="2"><a href="<?php echo $ENV_GOBACK_URL;?>">会员管理</a> - 修改会员</td>
 				</tr>
-				<?php if ($row['matt']==10) echo '<tr><td colspan="2"><div class="alert alert-info mb-0">当前会员关连网站管理员</div></td></tr>';?>
+				<?php if ($row['matt']==10) echo '<tr><td colspan="2"><div class="alert alert-info mb-0">该会员关连网站管理员，修改不当会导致无法登录</div></td></tr>';?>
 				<tr>
 					<td width="260">头像/会员名：</td>
 					<td>
@@ -64,7 +64,7 @@
 					<td>
 						<?php
 						$MemberTypes = array();
-						$dsql->SetQuery("SELECT `rank`,membername From `#@__arcrank` where `rank`>0 ORDER BY `rank` ASC");
+						$dsql->SetQuery("SELECT `rank`,membername FROM `#@__arcrank` WHERE `rank` > 0 ORDER BY `rank` ASC");
 						$dsql->Execute('n');
 						$MemberTypes[0] = "限制会员";
 						while($nrow = $dsql->GetObject('n')){

src/admin/templets/member_rank.htm

@@ -17,7 +17,7 @@
 				</tr>
 				<tr>
 					<td colspan="6">
-						<div class="alert alert-info mb-0">级别名称和级别值：注册会员这个级别不能删除，否则会员系统会无法正常使用某些功能</div>
+						<div class="alert alert-info mb-0">会员级别说明：注册会员级别不能删除，删除会影响会员功能无法使用某些功能</div>
 					</td>
 				</tr>
 				<tr align="center">
@@ -49,7 +49,7 @@
 				<input type="hidden" name="idend" value="<?php echo $k;?>">
 				<tr>
 					<td colspan="6">
-						<div class="alert alert-info mb-0">新增一个级别：由于会员升级是以级别值由低向高升级的，因此添加组别时需注意此值的设置，如果您添加新的会员组的级别值低于10，将自动被视为普通的注册会员</div>
+						<div class="alert alert-info mb-0">会员级别说明：由于会员级别值由低向高升级，因此添加组别时需注意此值，如果您添加会员组的级别值低于10，将自动被视为普通的注册会员</div>
 					</td>
 				</tr>
 				<tr align="center">

src/admin/templets/mychannel_add.htm

@@ -64,7 +64,7 @@
 							<option value="0">游客</option>
 							<?php
 							$urank = $cuserLogin->getUserRank();
-							$dsql->SetQuery("SELECT * FROM `#@__arcrank` where adminrank<='$urank' And `rank`>=10");
+							$dsql->SetQuery("SELECT * FROM `#@__arcrank` where adminrank<='$urank' And `rank` >= 10");
 							$dsql->Execute();
 							while($row2 = $dsql->GetObject())
 							{

src/admin/templets/mychannel_edit.htm

@@ -26,7 +26,7 @@
 				<?php if ($row['issystem'] == 1) {?>
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-danger mb-0">修改系统模型有风险，请不要随便修改系统模型的字段相关属性</div>
+						<div class="alert alert-danger mb-0">系统模型字段参数配置，修改不当会导致模型出错</div>
 					</td>
 				</tr>
 				<?php }?>
@@ -70,7 +70,7 @@
 							<option value="0">游客</option>
 							<?php
 							$urank = $cuserLogin->getUserRank();
-							$dsql->SetQuery("SELECT * FROM `#@__arcrank` where adminrank<='$urank' And `rank`>=10");
+							$dsql->SetQuery("SELECT * FROM `#@__arcrank` where adminrank<='$urank' And `rank` >= 10");
 							$dsql->Execute();
 							while($row2 = $dsql->GetObject())
 							{
@@ -181,7 +181,7 @@
 							</tr>
 							<?php } else {?>
 							<tr>
-								<td colspan='5'>下面列出的字段是附加表的字段，除此外，它还包含主表archives的所有字段</td>
+								<td colspan='5'>下面是附加表字段，还包含主表archives所有字段</td>
 							</tr>
 							<?php
 							}
@@ -218,25 +218,19 @@
 									<?php
 									$ft = $ctag->GetAtt('autofield');
 									if ($ft=='' || $ft==0) {
-									echo "固化字段";
+										echo "固化字段";
 									} else {
-										echo "自动表单";
+										echo "自动字段";
 									}
 									?>
 								</td>
 								<td>
-									<?php
-									if ($ft==1) {
-									?>
+									<?php if ($ft==1) {?>
 									<a href="mychannel_field_edit.php?id=<?php echo $id;?>&fname=<?php echo $ctag->GetTagName();?>&issystem=<?php echo $row['issystem'];?>" class="btn btn-success btn-sm"><i class="fa fa-pencil-square"></i> 修改</a>
 									<?php if ($row['issystem']!=1) {?>
 									<a href="javascript:;" onclick="javascript:DelNote('mychannel_field_edit.php?id=<?php echo $id;?>&fname=<?php echo $ctag->GetTagName();?>&action=delete');" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i> 删除</a>
 									<?php }?>
-									<?php
-									} else {
-									  echo "<span class='btn btn-danger btn-sm'><i class='fa fa-times'></i> 禁止</span>";
-									}
-									?>
+									<?php } else {echo "<span class='btn btn-danger btn-sm'><i class='fa fa-times'></i> 禁止</span>";}?>
 								</td>
 							</tr>
 							<?php }}?>

src/admin/templets/mychannel_field_add.htm

@@ -23,7 +23,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-danger mb-0">修改时禁止输入双引号["]，则表单保存失败</div>
+						<div class="alert alert-danger mb-0">修改文档模型字段时禁止输入双引号"</div>
 					</td>
 				</tr>
 				<tr>
@@ -171,11 +171,11 @@
 					return false;
 				}
 				if (notAllow.indexOf(" "+fieldname+" ") >-1 ) {
-					ShowMsg("字段名称不合法，如下字段名已经存在，建议在名称后加上数字以区分：\n"+notAllow);
+					ShowMsg("字段名称不合法，字段名已经存在，建议在名称后加上数字以区分：\n"+notAllow);
 					return false;
 				}
 				if ((dtype=="radio" || dtype=="select" || dtype=="checkbox") && vdefault=="") {
-					ShowMsg("您选择的select或radio、checkbox类型，必须默认值设置选择的项目（用英文逗号分开）");
+					ShowMsg("自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号分开，如：DedeBIZ,得德");
 					return false;
 				}
 				if (spage=="no") spage = "";

src/admin/templets/mychannel_field_edit.htm

@@ -26,7 +26,7 @@
 				<?php if ($row['issystem'] == 1) {?>
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-danger mb-0">修改系统模型有风险，请不要随便修改系统模型的字段相关属性</div>
+						<div class="alert alert-danger mb-0">系统模型字段参数配置，修改不当会导致模型出错</div>
 					</td>
 				</tr>
 				<?php }?>
@@ -167,7 +167,7 @@
 					return false;
 				}
 				if ((dtype == "radio" || dtype == "select" || dtype == "checkbox") && vdefault == "") {
-					ShowMsg("您选择的select或radio、checkbox类型，必须默认值设置选择的项目（用英文逗号分开）");
+					ShowMsg("自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号分开，如：DedeBIZ,得德");
 					return false;
 				}
 				if (spage == "no") spage = "";

src/admin/templets/mytag_tag_guide.htm

@@ -62,7 +62,7 @@
 						<?php
 						echo "<select name='channel' class='admin-input-sm'>";
 						echo "<option value='0' selected>不限模型</option>";
-						$tl->dsql->SetQuery("Select id,typename From `#@__channeltype` where id>0");
+						$tl->dsql->SetQuery("SELECT id,typename FROM `#@__channeltype` WHRER id > 0");
 						$tl->dsql->Execute();
 						while($row = $tl->dsql->GetObject())
 						{

src/admin/templets/soft_add.htm

@@ -24,13 +24,13 @@
 				var endNum = parseInt(document.form1.picnum.value) + startNum - 1;
 				if (endNum > 30) endNum = 30;
 				for (startNum; startNum <= endNum; startNum++) {
-					upfield.innerHTML += "<div class='py-2'><label>软件地址" + startNum + "：<input type='text' name='softurl" + startNum + "' value='http://' class='admin-input-lg'></label><label class='ml-2'>地址名称：<input type='text' name='servermsg" + startNum + "' class='admin-input-sm'></label></div>";
+					upfield.innerHTML += "<div class='py-2'><label>软件网址" + startNum + "：<input type='text' name='softurl" + startNum + "' value='' class='admin-input-lg'></label><label class='ml-2'>下载名称" + startNum + "：<input type='text' name='servermsg" + startNum + "' value='服务器" + startNum + "' class='admin-input-sm'></label></div>";
 				}
 			}
 			function ShowHideAddr() {
 				document.getElementById('morelink').style.display = (document.getElementById('morelink').style.display == 'block' ? 'none' : 'block');
 				document.getElementById('morelink').style.height = '100%';
-				document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏地址' : '显示地址');
+				document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏网址' : '显示网址');
 			}
 		</script>
 	</head>
@@ -274,9 +274,13 @@
 						<table>
 							<tr>
 								<td width="120">官方网址：</td>
-								<td width="370"><input type="text" name="officialUrl" id="officialUrl" value="http://" class="admin-input-lg"></td>
-								<td width="120">演示地址：</td>
-								<td><input type="text" name="officialDemo" id="officialDemo" value="http://" class="admin-input-lg"></td>
+								<td width="420"><input type="text" name="officialUrl" id="officialUrl" value="" class="admin-input-lg" placeholder="请输入演示网址http开头"></td>
+								<td width="120">演示网址：</td>
+								<td>
+									<input type="text" name="officialDemo" id="officialDemo" value="" class="admin-input-lg" placeholder="请选择网页上传或填写演示网址">
+									<button type="button" name="" id="" class="btn btn-success btn-sm" onclick="">选择</button>
+									<label><input type="checkbox" name="" id="" checked="checked"> 上传压缩包自动解压</label>
+								</td>
 							</tr>
 						</table>
 					</td>
@@ -286,20 +290,20 @@
 						<table>
 							<tr>
 								<td width="120">软件大小：</td>
-								<td width="310">
+								<td width="370">
 									<input type="text" name="softsize" id="softsize" class="admin-input-sm">
 									<select name="unit" id="unit">
 										<option value="MB" selected>MB</option>
 										<option value="KB">KB</option>
 										<option value="GB">GB</option>
 									</select>
-									<label><input type="checkbox" name="autosize" id="autosize" value="1" checked="checked">自动获取</label>
+									<label><input type="checkbox" name="autosize" id="autosize" value="1" checked="checked"> 自动获取</label>
 								</td>
 								<td width="120">需会员权限：</td>
 								<td align="left">
 									<select name="daccess" id="daccess" class="admin-input-sm">
 										<?php
-										$dsql->SetQuery("SELECT * FROM `#@__arcrank` where `rank`>=0 ");
+										$dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE `rank` >= 0 ");
 										$dsql->Execute();
 										while($row = $dsql->GetArray())
 										{
@@ -320,20 +324,42 @@
 					<td class="admin-td">
 						<table>
 							<tr>
-								<td width="120">本地地址：</td>
-								<td width="410">
+								<td width="120">本地上传：</td>
+								<td width="460">
 									<input type="text" name="softurl1" id="softurl1" class="admin-input-lg">
-									<button type="button" name="sel1" id="sel1" class="btn btn-success btn-sm" onclick="SelectSoft('form1.softurl1')">选取</button>
+									<button type="button" name="sel1" id="sel1" class="btn btn-success btn-sm" onclick="SelectSoft('form1.softurl1')">选择</button>
 								</td>
-								<td width="120">地址名称：</td>
+								<td width="120">下载名称：</td>
 								<td><input type="text" name="servermsg1" id="servermsg1" value="本地下载" class="admin-input-sm"></td>
 							</tr>
 						</table>
 					</td>
 				</tr>
+				<tr>
+					<td class="admin-td">
+						<table>
+							<tr>
+								<td width="120">链接上传：</td>
+								<td>
+									<input type="text" name="picnum" id="picnum" value="5" class="admin-input-sm">
+									<button type="button" name="kkkup" id="kkkup2" class="btn btn-success btn-sm" onclick="MakeUpload();">添加网址</button>
+									<button type="button" name="Submit3" id="btsh3" class="btn btn-success btn-sm" onclick="ShowHideAddr();">隐藏网址</button>
+								</td>
+							</tr>
+						</table>
+						<div id="morelink" style="display:block">
+							<div id="uploadfield"></div>
+						</div>
+					</td>
+				</tr>
 				<?php if ($softconfig['moresitedo'] == 0 && trim($softconfig['sites']) != '') {?>
 				<tr>
 					<td class="admin-td">
+						<table>
+							<tr>
+								<td width="120">镜像上传：</td>
+							</tr>
+						</table>
 						<?php
 						$sites = explode("\n", $softconfig['sites']);
 						$startNum = 2;
@@ -347,10 +373,10 @@
 						?>
 						<div class="py-2">
 							<input type="hidden" name="forconfig<?php echo $startNum;?>" value="1">
-							<label>填写域名：<input type="text" name="softurlfirst<?php echo $startNum;?>" class="admin-input-lg" value="<?php echo $siteurl;?>"></label>
-							<label>填写目录：<input type="text" name="softurl<?php echo $startNum;?>" class="admin-input-sm"></label>
-							<label>地址名称：<input type="text" name="servermsg<?php echo $startNum;?>" class="admin-input-sm" value="<?php echo $sitename;?>"></label>
-							<label><input type="checkbox" name="need<?php echo $startNum;?>" value="1" checked="checked"> 启用</label>
+							<label>镜像域名：<input type="text" name="softurlfirst<?php echo $startNum;?>" class="admin-input-lg" value="<?php echo $siteurl;?>"></label>
+							<label>镜像目录：<input type="text" name="softurl<?php echo $startNum;?>" class="admin-input-sm"></label>
+							<label>镜像名称：<input type="text" name="servermsg<?php echo $startNum;?>" class="admin-input-sm" value="<?php echo $sitename;?>"></label>
+							<label><input type="checkbox" name="need<?php echo $startNum;?>" value="1"> 启用</label>
 						</div>
 						<?php
 						$startNum++;
@@ -360,23 +386,6 @@
 					</td>
 				</tr>
 				<?php }?>
-				<tr>
-					<td class="admin-td">
-						<table>
-							<tr>
-								<td width="120">其它地址：</td>
-								<td>
-									<input type="text" name="picnum" id="picnum" value="5" class="admin-input-sm">
-									<button type="button" name="kkkup" class="btn btn-success btn-sm" id="kkkup2" onclick="MakeUpload();">添加地址</button>
-									<button type="button" class="btn btn-success btn-sm" name="Submit3" id="btsh3" onclick="ShowHideAddr();">隐藏地址</button>
-								</td>
-							</tr>
-						</table>
-						<div id="morelink" style="display:block">
-							<div id="uploadfield"></div>
-						</div>
-					</td>
-				</tr>
 				<tr>
 					<td class="admin-td">
 						<table>
@@ -431,7 +440,7 @@
 								<td width="120">标题颜色：</td>
 								<td>
 									<input type="text" name="color" id="color" class="admin-input-sm">
-									<button type="button" name="modcolor" id="modcolor" class="btn btn-success btn-sm" onclick="ShowColor(event,this)">选取</button>
+									<button type="button" name="modcolor" id="modcolor" class="btn btn-success btn-sm" onclick="ShowColor(event,this)">选择</button>
 								</td>
 							</tr>
 						</table>

src/admin/templets/soft_config.htm

@@ -18,23 +18,18 @@
 				<tr>
 					<td bgcolor="#f5f5f5" colspan="2">软件下载设置</td>
 				</tr>
-				<tr>
-					<td colspan="2">
-						<div class="alert alert-info mb-0">软件模型的附件下载方式都必须链接到中转页，否则无效</div>
-					</td>
-				</tr>
 				<tr>
 					<td width="260">链接显示方式：</td>
 					<td>
-						<label><input type="radio" name="downtype" value="0" <?php if ($row['downtype']==0) echo " checked='checked' ";?>> 直接显示地址列表</label>
-						<label><input type="radio" name="downtype" value="1" <?php if ($row['downtype']==1) echo " checked='checked' ";?>> 要求进入下载地址列表页</label>
+						<label><input type="radio" name="gotojump" value="0" <?php if ($row['gotojump']==0) echo " checked='checked' ";?>> 真实软件链接地址</label>
+						<label><input type="radio" name="gotojump" value="1" <?php if ($row['gotojump']==1) echo " checked='checked' ";?>> 字符软件链接地址</label>
 					</td>
 				</tr>
 				<tr>
-					<td>附件下载方式：</td>
+					<td>软件下载方式：</td>
 					<td>
-						<label><input type="radio" name="gotojump" value="0" <?php if ($row['gotojump']==0) echo " checked='checked' ";?>> 链接到真实软件地址</label>
-						<label><input type="radio" name="gotojump" value="1" <?php if ($row['gotojump']==1) echo " checked='checked' ";?>> 链接到跳转页面</label>
+						<label><input type="radio" name="downtype" value="0" <?php if ($row['downtype']==0) echo " checked='checked' ";?>> 当前软件发布页</label>
+						<label><input type="radio" name="downtype" value="1" <?php if ($row['downtype']==1) echo " checked='checked' ";?>> 链接到地址列表页</label>
 					</td>
 				</tr>
 				<tr>
@@ -54,8 +49,8 @@
 				<tr>
 					<td>镜像处理方式：</td>
 					<td>
-						<label><input type="radio" name="moresitedo" value="1" <?php if ($row['moresitedo']==1) echo " checked='checked' ";?>> 根据本地地址和服务器列表自动生成</label>
-						<label><input type="radio" name="moresitedo" value="0" <?php if ($row['moresitedo']==0) echo " checked='checked' ";?>> 发布时按服务器生成列表由我手工填写</label>
+						<label><input type="radio" name="moresitedo" value="1" <?php if ($row['moresitedo']==1) echo " checked='checked' ";?>> 本地地址和服务器列表自动生成</label>
+						<label><input type="radio" name="moresitedo" value="0" <?php if ($row['moresitedo']==0) echo " checked='checked' ";?>> 按服务器生成列表由我手工填写</label>
 					</td>
 				</tr>
 				<tr>
@@ -64,7 +59,7 @@
 						<select name="dfrank" id="dfrank" class="admin-input-sm">
 							<?php
 							$urank = $cuserLogin->getUserRank();
-							$dsql->SetQuery("SELECT * FROM `#@__arcrank` where `rank`>=0 ");
+							$dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE `rank` >= 0 ");
 							$dsql->Execute();
 							while($nrow = $dsql->GetArray())
 							{
@@ -84,16 +79,16 @@
 				<tr>
 					<td>参数限制方式：</td>
 					<td>
-						<label><input type="radio" name="argrange" value="0" <?php if ($row['argrange']==0) echo " checked='checked' ";?>> 允许发布时重新选择权限</label>
-						<label><input type="radio" name="argrange" value="2" <?php if ($row['argrange']==1) echo " checked='checked' ";?>> 所有软件均使用此权限</label>
+						<label><input type="radio" name="argrange" value="0" <?php if ($row['argrange']==0) echo " checked='checked' ";?>> 所有软件重新选择权限</label>
+						<label><input type="radio" name="argrange" value="1" <?php if ($row['argrange']==1) echo " checked='checked' ";?>> 所有软件均使用此权限</label>
 					</td>
 				</tr>
 				<tr>
 					<td>镜像服务器列表：</td>
 					<td>
-						<label>服务器网址：<input type="text" name="serverurl" id="serverurl" value="http://"></label>
-						<label>服务器名称：<input type="text" name="servername" id="servername"></label>
-						<label>服务器类型：<input type="text" name="servertype" id="servertype" value="默认"></label>
+						<label>镜像域名：<input type="text" name="serverurl" id="serverurl" value=""></label>
+						<label>镜像目录：<input type="text" name="servername" id="servername"></label>
+						<label>镜像名称：<input type="text" name="servertype" id="servertype" value="默认下载地址"></label>
 						<button type="button" name="Submit" onclick="AddServer()" class="btn btn-success btn-sm">添加一项</button>
 					</td>
 				</tr>
@@ -116,9 +111,18 @@
 		</form>
 		<script>
 			function AddServer() {
-				if (document.form1.serverurl.value == "" || document.form1.serverurl.value == "http://") { ShowMsg('服务器网址不能为空'); return; }
-				if (document.form1.servername.value == "") { ShowMsg('服务器名称不能为空'); return; }
-				if (document.form1.servertype.value == "") { ShowMsg('服务器类型不能为空'); return; }
+				if (document.form1.serverurl.value == "" || document.form1.serverurl.value == "") {
+					ShowMsg('镜像域名不能为空');
+					return;
+				}
+				if (document.form1.servername.value == "") {
+					ShowMsg('镜像目录不能为空');
+					return;
+				}
+				if (document.form1.servertype.value == "") {
+					ShowMsg('镜像名称不能为空');
+					return;
+				}
 				document.form1.sites.value += document.form1.serverurl.value + " | " + document.form1.servername.value + " | " + document.form1.servertype.value + "";
 			}
 		</script>

src/admin/templets/soft_edit.htm

@@ -24,12 +24,12 @@
 				var endNum = parseInt(document.form1.picnum.value) + startNum;
 				if (endNum > 30) endNum = 30;
 				for (startNum; startNum < endNum; startNum++) {
-					upfield.innerHTML += "<div class='py-2'><label>软件地址" + startNum + "：<input type='text' name='softurl" + startNum + "' value='http://' class='admin-input-lg'></label><label class='ml-2'>地址名称：<input type='text' name='servermsg" + startNum + "' class='admin-input-sm'><label></div>";
+					upfield.innerHTML += "<div class='py-2'><label>软件网址" + startNum + "：<input type='text' name='softurl" + startNum + "' value='' class='admin-input-lg'></label><label class='ml-2'>下载名称" + startNum + "：<input type='text' name='servermsg" + startNum + "' value='服务器" + startNum + "' class='admin-input-sm'><label></div>";
 				}
 			}
 			function ShowHideAddr() {
 				document.getElementById('morelink').style.display = (document.getElementById('morelink').style.display == 'block' ? 'none' : 'block');
-				document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏地址' : '显示地址');
+				document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏网址' : '显示网址');
 			}
 		</script>
 	</head>
@@ -280,9 +280,13 @@
 						<table>
 							<tr>
 								<td width="120">官方网址：</td>
-								<td width="370"><input type="text" name="officialUrl" id="officialUrl" value="<?php echo $addRow['officialUrl']?>" class="admin-input-lg"></td>
-								<td width="120">程序演示：</td>
-								<td><input type="text" name="officialDemo" id="officialDemo" value="<?php echo $addRow['officialDemo']?>" class="admin-input-lg"></td>
+								<td width="420"><input type="text" name="officialUrl" id="officialUrl" value="<?php echo $addRow['officialUrl']?>" class="admin-input-lg" placeholder="请输入演示网址http开头"></td>
+								<td width="120">演示网址：</td>
+								<td>
+									<input type="text" name="officialDemo" id="officialDemo" value="<?php echo $addRow['officialDemo']?>" class="admin-input-lg" placeholder="请选择网页上传或填写演示网址">
+									<button type="button" name="" id="" class="btn btn-success btn-sm" onclick="">上传</button>
+									<label><input type="checkbox" name="" id="" checked="checked"> 上传压缩包自动解压</label>
+								</td>
 							</tr>
 						</table>
 					</td>
@@ -292,12 +296,12 @@
 						<table>
 							<tr>
 								<td width="120">软件大小：</td>
-								<td width="370"><input name="softsize" type="text" id="softsize" value="<?php echo $addRow['softsize']?>" class="admin-input-lg"></td>
+								<td width="370"><input name="softsize" type="text" id="softsize" value="<?php echo $addRow['softsize']?>" class="admin-input-sm"></td>
 								<td width="120">需会员权限：</td>
 								<td>
 									<select name="daccess" id="daccess" class="admin-input-sm">
 										<?php
-										$dsql->SetQuery("SELECT * FROM `#@__arcrank` where `rank`>=0 ");
+										$dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE `rank` >= 0 ");
 										$dsql->Execute();
 										while($row = $dsql->GetArray())
 										{
@@ -318,11 +322,11 @@
 					<td class="admin-td">
 						<table>
 							<tr>
-								<td width="120">其它地址：</td>
+								<td width="120">链接上传：</td>
 								<td>
-									<input type="text" name="picnum" id="picnum" size="8" value="5">
-									<button type="button" name="kkkup" id="kkkup2" class="btn btn-success btn-sm" onclick="MakeUpload();">添加地址</button>
-									<button type="button" name="Submit3" id="btsh3" class="btn btn-success btn-sm" onclick="ShowHideAddr();">隐藏地址</button>
+									<input type="text" name="picnum" id="picnum" class="admin-input-sm" value="5">
+									<button type="button" name="kkkup" id="kkkup2" class="btn btn-success btn-sm" onclick="MakeUpload();">添加网址</button>
+									<button type="button" name="Submit3" id="btsh3" class="btn btn-success btn-sm" onclick="ShowHideAddr();">隐藏网址</button>
 								</td>
 							</tr>
 						</table>
@@ -392,7 +396,7 @@
 								<td width="120">标题颜色：</td>
 								<td>
 									<input type="text" name="color" id="color" value="<?php echo $arcRow['color']?>" class="admin-input-sm">
-									<button class='btn btn-success btn-sm' name="modcolor" type="button" id="modcolor" onclick="ShowColor(event,this)">选取</button>
+									<button class='btn btn-success btn-sm' name="modcolor" type="button" id="modcolor" onclick="ShowColor(event,this)">选择</button>
 								</td>
 							</tr>
 						</table>

src/admin/templets/spec_add.htm

@@ -274,7 +274,7 @@
 								<td width="120">标题颜色：</td>
 								<td>
 									<input type="text" name="color" id="color" class="admin-input-sm">
-									<button type="button" name="modcolor" id="modcolor" class="btn btn-success btn-sm" onclick="ShowColor(event,this)">选取</button>
+									<button type="button" name="modcolor" id="modcolor" class="btn btn-success btn-sm" onclick="ShowColor(event,this)">选择</button>
 								</td>
 							</tr>
 						</table>

src/admin/templets/spec_edit.htm

@@ -325,7 +325,7 @@
 								<td width="120">标题颜色：</td>
 								<td>
 									<input type="text" name="color" id="color" class="admin-input-sm" value="<?php echo $arcRow['color']?>">
-									<button type="button" name="modcolor" id="modcolor" value="" onclick="ShowColor(event,this)" class="btn btn-success btn-sm">选取</button>
+									<button type="button" name="modcolor" id="modcolor" value="" onclick="ShowColor(event,this)" class="btn btn-success btn-sm">选择</button>
 								</td>
 							</tr>
 						</table>

src/admin/templets/sys_admin_user.htm

@@ -23,11 +23,6 @@
 			<tr>
 				<td bgcolor="#f5f5f5" colspan="6">管理员管理</td>
 			</tr>
-			<tr>
-				<td colspan="6">
-					<div class="alert alert-info mb-0">为了防止错误操作，系统不允许在管理界面删除超级管理员，如果确定要删除，请自行在数据表biz_admin中删除</div>
-				</td>
-			</tr>
 			<tr bgcolor="#e9ecef" align="center">
 				<td width="10%">会员名</td>
 				<td width="20%">昵称</td>

src/admin/templets/sys_cache_up.htm

@@ -17,11 +17,11 @@
 				</tr>
 				<tr>
 					<td>
-						<div class="alert alert-info mb-0">默认执行下面的操作：1、更新栏目缓存 2、更新枚举缓存 3、清理文档调用缓存 4、清理过期会员浏览历史 5、删除过期会员短信 6、删除过期流量统计</div>
+						<div class="alert alert-info mb-0">更新缓存说明：1、更新栏目缓存 2、更新枚举缓存 3、清理文档调用缓存 4、清理过期会员浏览历史 5、删除过期会员短信 6、删除过期流量统计</div>
 					</td>
 				</tr>
 				<tr>
-					<td><label><input type="checkbox" name="uparc" value="1"> 出现页码不正确和无法解析文档等情况，执行清理错误文档</label></td>
+					<td><label><input type="checkbox" name="uparc" value="1"> 页码不正确和无法解析文档等情况，自动清理错误文档</label></td>
 				</tr>
 				<tr>
 					<td bgcolor="#e9ecef" align="center">

src/admin/templets/sys_data_replace.htm

@@ -21,7 +21,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-danger mb-0">数据库字段批量替换中某字段值，如果操作不当会导致数据库错误</div>
+						<div class="alert alert-danger mb-0">数据库字段批量替换数据，操作不当会导致数据出错</div>
 					</td>
 				</tr>
 				<tr>
@@ -83,7 +83,7 @@
 					</td>
 				</tr>
 				<tr>
-					<td>安全确认码：</td>
+					<td>验证码：</td>
 					<td>
 						<input type="text" name="validate" class="admin-input-sm text-uppercase">
 						<img src="../apps/vdimgck.php" onclick="this.src='../apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">

src/admin/templets/tag_test.htm

@@ -22,11 +22,6 @@
 				<tr>
 					<td bgcolor="#f5f5f5" colspan="2">全局标记测试</td>
 				</tr>
-				<tr>
-					<td>
-						<div class="alert alert-info mb-0">全局标记应用在网站首页、单独页面、封面栏目使用的单独模板标记，在列表或文档模板中，一般只允许调用channel、arclist标记（hotart、coolart、imglist等都是这个标记延伸出来的标记），但是环境变量限定为文档或列表所在的栏目，如果您要测试的标记是在列表或文档中使用，请指定环境变量（栏目id）各标记的具体含义和用途</div>
-					</td>
-				</tr>
 				<tr>
 					<td colspan="2">
 						<span>环境变量：</span>

src/admin/templets/templets_tagsource.htm

@@ -15,7 +15,7 @@
 			</tr>
 			<tr>
 				<td colspan="4">
-					<div class="alert alert-danger mb-0">修改系统标签有风险，文件存放/system/taglib文件夹</div>
+					<div class="alert alert-danger mb-0">系统标签源码文件，修改不当会导致标签错误</div>
 				</td>
 			</tr>
 			<tr bgColor="#e9ecef" align="center">

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

@@ -30,14 +30,14 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-info mb-0">请先作好备份标签源码文件在进行修改，如果二次修改错误会导致标签无法解析。标签文件名为：标签名.lib.php接口函数定义为：function lib_标签名(&$ctag,&$refObj)，返回值是结果字符串，修改标签时为了防止出错，您也可以修改它的名称同时修改文件名和函数名，这样等同继承了原来标签的代码建立一个新的标签</div>
+						<div class="alert alert-danger mb-0">系统标签源码文件，修改不当会导致标签错误</div>
 					</td>
 				</tr>
 				<tr>
 					<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/install/sql-dfdata.txt

@@ -504,7 +504,7 @@ INSERT INTO `#@__area` VALUES ('1','北京市','0','0'),
 
 INSERT INTO `#@__channeltype` VALUES ('1','article','文档模型','#@__archives','#@__addonarticle','article_add.php','content_list.php','article_edit.php','article_add.php','content_list.php','article_edit.php','<field:body itemname="文档" autofield="0" notsend="0" type="htmltext" isnull="true" islist="1" maxlength="" page="split">\t\n</field:body>\t\n','','','1','1','1','-1','','10','0','1','1','标题','0','0'),
 ('2','image','图片模型','#@__archives','#@__addonimages','album_add.php','content_i_list.php','album_edit.php','album_add.php','content_list.php','album_edit.php','<field:pagestyle itemname="页面风格" type="number" isnull="true" default="2" rename="" notsend="1" />\t\n<field:imgurls itemname="图片集合" type="img" isnull="true" rename="" page="split" />\t\n<field:body itemname="图集文档" autofield="0" notsend="0" type="htmltext" isnull="true" islist="0" maxlength="255" page=""></field:body>','','','1','1','1','-1','','10','0','1','1','标题','0','0'),
-('3','soft','软件模型','#@__archives','#@__addonsoft','soft_add.php','content_i_list.php','soft_edit.php','','','','<field:filetype islist="1" itemname="文件类型" type="text" isnull="true" rename="" />\t\n<field:language islist="1" itemname="语言" type="text" isnull="true" rename="" />\t\n<field:softtype islist="1" itemname="软件类型" type="text" isnull="true" rename="" />\t\n<field:accredit islist="1" itemname="授权方式" type="text" isnull="true" rename="" />\t\n<field:os islist="1" itemname="操作系统" type="text" isnull="true" rename="" />\t\n<field:softrank islist="1" itemname="软件等级" type="int" isnull="true" default="3" rename="" function="GetRankStar(@me)" notsend="1" />\t\n<field:officialUrl itemname="官方网址" type="text" isnull="true" rename="" />\t\n<field:officialDemo itemname="演示网址" type="text" isnull="true" rename="" />\t\n<field:softsize itemname="软件大小" type="text" isnull="true" rename="" />\t\n<field:softlinks itemname="软件地址" type="softlinks" isnull="true" rename="" />\t\n<field:introduce itemname="详细介绍" type="htmltext" isnull="trnue" rename="" />\t\n<field:daccess islist="1" itemname="下载级别" type="int" isnull="true" default="0" rename="" function="" notsend="1" />\t\n<field:needmoney islist="1" itemname="需要金币" type="int" isnull="true" default="0" rename="" function="" notsend="1" />','filetype,language,softtype,os,accredit,softrank','','1','1','1','-1','','10','0','1','1','标题','0','0'),
+('3','soft','软件模型','#@__archives','#@__addonsoft','soft_add.php','content_i_list.php','soft_edit.php','','','','<field:filetype islist="1" itemname="文件类型" type="text" isnull="true" rename="" />\t\n<field:language islist="1" itemname="语言" type="text" isnull="true" rename="" />\t\n<field:softtype islist="1" itemname="软件类型" type="text" isnull="true" rename="" />\t\n<field:accredit islist="1" itemname="授权方式" type="text" isnull="true" rename="" />\t\n<field:os islist="1" itemname="操作系统" type="text" isnull="true" rename="" />\t\n<field:softrank islist="1" itemname="软件等级" type="int" isnull="true" default="3" rename="" function="GetRankStar(@me)" notsend="1" />\t\n<field:officialUrl itemname="官方网址" type="text" isnull="true" rename="" />\t\n<field:officialDemo itemname="演示网址" type="text" isnull="true" rename="" />\t\n<field:softsize itemname="软件大小" type="text" isnull="true" rename="" />\t\n<field:softlinks itemname="软件网址" type="softlinks" isnull="true" rename="" />\t\n<field:introduce itemname="详细介绍" type="htmltext" isnull="trnue" rename="" />\t\n<field:daccess islist="1" itemname="下载级别" type="int" isnull="true" default="0" rename="" function="" notsend="1" />\t\n<field:needmoney islist="1" itemname="需要金币" type="int" isnull="true" default="0" rename="" function="" notsend="1" />','filetype,language,softtype,os,accredit,softrank','','1','1','1','-1','','10','0','1','1','标题','0','0'),
 ('-1','spec','专题模型','#@__archives','#@__addonspec','spec_add.php','content_s_list.php','spec_edit.php','','','','<field:note type="specialtopic" isnull="true" rename="" />','','','1','1','0','-1','','10','0','1','1','标题','0','0'),
 ('-8','infos','分类模型','#@__archives','#@__addoninfos','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','archives_sg_add.php','content_sg_list.php','archives_sg_edit.php','<field:channel itemname="栏目id" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="10" page=""></field:channel>\t\n<field:arcrank itemname="浏览权限" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="5" page=""></field:arcrank>\t\n<field:mid itemname="会员id" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="8" page=""></field:mid>\t\n<field:click itemname="点击" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="10" page=""></field:click>\t\n<field:title itemname="标题" autofield="0" notsend="0" type="text" isnull="true" islist="1" default="0" maxlength="60" page=""></field:title>\t\n<field:senddate itemname="发布时间" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="10" page=""></field:senddate>\t\n<field:flag itemname="推荐属性" autofield="0" notsend="0" type="checkbox" isnull="true" islist="1" default="0" maxlength="10" page=""></field:flag>\t\n<field:litpic itemname="缩略图" autofield="0" notsend="0" type="text" isnull="true" islist="1" default="0" maxlength="60" page=""></field:litpic>\t\n<field:userip itemname="会员IP" autofield="0" notsend="0" type="text" isnull="true" islist="0" default="0" maxlength="15" page=""></field:userip>\t\n<field:lastpost itemname="最后评论时间" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="10" page=""></field:lastpost>\t\n<field:scores itemname="评论积分" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="8" page=""></field:scores>\t\n<field:goodpost itemname="好评数" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="8" page=""></field:goodpost>\t\n<field:badpost itemname="差评数" autofield="0" notsend="0" type="int" isnull="true" islist="1" default="0" maxlength="8" page=""></field:badpost>\t\n<field:nativeplace itemname="地区" autofield="1" notsend="0" type="stepselect" isnull="true" islist="1" default="0" maxlength="255" page="">\t\n</field:nativeplace>\t\n<field:infotype itemname="信息类型" autofield="1" notsend="0" type="stepselect" isnull="true" islist="1" default="0" maxlength="255" page="">\t\n</field:infotype>\t\n<field:body itemname="信息文档" autofield="1" notsend="0" type="htmltext" isnull="true" islist="0" maxlength="255" page="">\t\n</field:body>\t\n<field:endtime itemname="截止日期" autofield="1" notsend="0" type="datetime" isnull="true" islist="1" maxlength="255" page="">\t\n</field:endtime>\t\n<field:linkman itemname="联系人" autofield="1" notsend="0" type="text" isnull="true" islist="0" maxlength="50" page="">\t\n</field:linkman>\t\n<field:tel itemname="联系电话" autofield="1" notsend="0" type="text" isnull="true" islist="0" maxlength="50" page="">\t\n</field:tel>\t\n<field:email itemname="邮箱" autofield="1" notsend="0" type="text" isnull="true" islist="0" maxlength="50" page="">\t\n</field:email>\t\n<field:address itemname="地址" autofield="1" notsend="0" type="text" isnull="true" islist="0" maxlength="100" page="">\t\n</field:address>\t\n','channel,arcrank,mid,click,title,senddate,flag,litpic,lastpost,scores,goodpost,badpost,nativeplace,infotype,endtime','','-1','1','1','-1','','0','0','0','1','信息标题','0','0');
 

src/static/web/css/admin.css

@@ -82,8 +82,9 @@ input[type=file] {
 	vertical-align:middle
 }
 input[type=button],input[type=submit],input[type=reset] {
-	padding:.375rem .75rem;
-	height:auto;
+	padding:.25rem .5rem;
+	line-height:1.5;
+	font-size:.875rem;
 	color:#fff;
 	background:#1eb867;
 	border:0;
@@ -152,6 +153,9 @@ body.hidemenu .body-right {
 	right:0;
 	bottom:0
 }
+.body-bg {
+	background:#f5f5f5
+}
 .main,.menu {
 	width:100%;
 	height:99%
@@ -259,7 +263,6 @@ body.hidemenu .body-right {
 	right:5px;
 	height:20px;
 	line-height:20px;
-	font-size:12px;
 	color:#545b62;
 	background:0;
 	border:0
@@ -374,7 +377,7 @@ body.hidemenu .body-right {
 	padding:.5rem;
 	width:120px;
 	background:#fff;
-	border:2px solid #dee2e6;
+	border:1px solid #dee2e6;
 	z-index:10005
 }
 .wsselect {
@@ -384,7 +387,7 @@ body.hidemenu .body-right {
 }
 .pubdlg {
 	background:#fff;
-	border:2px solid #dee2e6;
+	border:1px solid #dee2e6;
 	z-index:8888
 }
 .pubdlg .title {
@@ -439,7 +442,7 @@ body.hidemenu .body-right {
 .mysource,.mywriter {
 	width:300px;
 	background:#fff;
-	border:2px solid #dee2e6;
+	border:1px solid #dee2e6;
 	z-index:10001
 }
 #uploadfield {
@@ -550,7 +553,8 @@ body.hidemenu .body-right {
 	height:60px
 }
 .admin-input-lg {
-	width:360px
+	width:360px;
+	height:28px
 }
 .admin-input-md {
 	width:260px
@@ -573,6 +577,19 @@ body.hidemenu .body-right {
 	width:20px;
 	height:20px
 }
+.upload-bg {
+	margin:10px;
+	background:#fff
+}
+.napisdiv {
+	position:absolute;
+	left:10;
+	top:10;
+	display:none;
+	width:150px;
+	height:100px;
+	z-index:9998
+}
 .fileinput-button {
 	display:inline-block;
 	position:relative;
@@ -591,7 +608,7 @@ span.page-link {
 	color:#fff;
 	background:#1eb867
 }
-table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubdlg,.colordlg,.quickselitem .topcat,.web-info,.cke_chrome,.cke_inner,.pagination,.card,.form-control,.btn-sm,.alert,.rounded,#edsta {
+table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubdlg,.colordlg,.quickselitem .topcat,.web-info,.upload-bg,.cke_chrome,.cke_inner,.pagination,.card,.form-control,.btn-sm,.alert,.rounded,#edsta {
 	border-radius:.5rem!important
 }
 .btn-xs {
@@ -640,19 +657,19 @@ table,input,select,textarea,.search,.menu-body,.coolbg,.mysource,.mywriter,.pubd
 @media (max-width:480px) {
 	.web-info {
 	word-break:break-all
-}
-.tips {
-	padding:0 15px
-}
-.tips-box {
-	width:100%
-}
-.m-d-none {
-	display:none
-}
+	}
+	.tips {
+		padding:0 15px
+	}
+	.tips-box {
+		width:100%
+	}
+	.m-d-none {
+		display:none
+	}
 }
 @media (min-width:480px) {
 	.modal-dialog {
 	max-width:500px
-}
+	}
 }

src/static/web/css/style.css

@@ -13,11 +13,13 @@
 	scrollbar-width:thin
 }
 body {
+	margin:0;
 	line-height:1.6;
 	letter-spacing:.6px;
 	font-size:14px;
 	font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
-	color:#545b62
+	color:#545b62;
+	background:#fff
 }
 a {
 	color:#545b62
@@ -348,6 +350,9 @@ input[type=file] {
 	padding:1.5rem;
 	background:#fff
 }
+.input-group-append .btn-sm {
+	line-height:1.8
+}
 .table {
 	color:#545b62
 }
@@ -426,7 +431,7 @@ input[type=file] {
 	border-top-left-radius:0!important;
 	border-bottom-left-radius:0!important
 }
-#btnScrollTop {
+#returntop {
 	display:none;
 	position:fixed;
 	padding:10px 14px;
@@ -439,26 +444,26 @@ input[type=file] {
 	border:0;
 	z-index:9998
 }
-#btnScrollTop:hover {
+#returntop:hover {
 	background:#e77817
 }
 @media (max-width:480px) {
 	.m-pb-1 {
 	padding-bottom:1rem
-}
-.m-pb-2 {
-	padding-bottom:2rem
-}
-.login-from {
-	width:100%
-}
-.bannr-img,.item-theme-img img,.list-article-img img {
-	height:250px
-}
-.item-news-img img {
-	height:210px
-}
-.feedbacks .feedback-action {
-	float:none
-}
+	}
+	.m-pb-2 {
+		padding-bottom:2rem
+	}
+	.login-from {
+		width:100%
+	}
+	.bannr-img,.item-theme-img img,.list-article-img img {
+		height:250px
+	}
+	.item-news-img img {
+		height:210px
+	}
+	.feedbacks .feedback-action {
+		float:none
+	}
 }

src/static/web/js/style.js

@@ -188,9 +188,9 @@ $(document).ready(function () {
 	window.onscroll = function () { scrollFunction() };
 	function scrollFunction() {
 		if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {
-			$("#btnScrollTop").show();
+			$("#returntop").show();
 		} else {
-			$("#btnScrollTop").hide();
+			$("#returntop").hide();
 		}
 	}
 });

src/static/web/js/user.album.js

@@ -20,7 +20,7 @@ function MakeUpload(mnum) {
 		}
 		fhtml = "";
 		fhtml += "<div class='mb-3'><label class='mb-0'><input type='checkbox' name='isokcheck" + startNum + "' id='isokcheck" + startNum + "' value='1' "+dsel+" onClick='CheckSelTable(" + startNum + ")'> 显示图片" + startNum + "上传框</label></div>";
-		fhtml += "<div id=\"seltb" + startNum + "\" class='form-group' style=\"" + dplay + "\"><label>图片" + startNum + "上传：</label><div class='input-group mb-3'><input type='text' name='imgfile" + startNum + "' class='form-control' placeholder='请选择图片上传或填写图片地址'><div class='input-group-append'><span class='btn btn-success btn-send' onClick=\"SelectImage('addcontent.imgfile" + startNum + "', 'big')\">选择</span></div></div><label>图片" + startNum + "简介：</label><textarea name='imgmsg" + startNum + "' class='form-control'></textarea></div>";
+		fhtml += "<div id=\"seltb" + startNum + "\" class='form-group' style=\"" + dplay + "\"><label>图片" + startNum + "上传：</label><div class='input-group mb-3'><input type='text' name='imgfile" + startNum + "' class='form-control' placeholder='请选择图片上传或填写图片地址'><div class='input-group-append'><span class='btn btn-success btn-sm btn-send' onClick=\"SelectImage('addcontent.imgfile" + startNum + "', 'big')\">选择</span></div></div><label>图片" + startNum + "简介：</label><textarea name='imgmsg" + startNum + "' class='form-control'></textarea></div>";
 		upfield.innerHTML += fhtml;
 	}
 }

src/system/helpers/archive.helper.php

@@ -74,8 +74,8 @@ if (!function_exists('GetOneArchive')) {
 /**
  *  获取模型的表信息
  *
- * @param     int   $id  模型id
- * @param     string   $formtype  表单类型
+ * @param     int  $id  模型id
+ * @param     string  $formtype  表单类型
  * @return    array
  */
 if (!function_exists('GetChannelTable')) {
@@ -96,7 +96,7 @@ if (!function_exists('GetChannelTable')) {
 /**
  *  获得某文档的所有tag
  *
- * @param     int     $aid  文档id
+ * @param     int  $aid  文档id
  * @return    string
  */
 if (!function_exists('GetTags')) {
@@ -140,7 +140,7 @@ if (!function_exists('GetIndexKey')) {
     }
 }
 /**
- *  更新微表key及Tag
+ *  更新微表key及tag
  *
  * @access    public
  * @param     int  $id  文档id
@@ -158,14 +158,14 @@ if (!function_exists('UpIndexKey')) {
         $addtime = time();
         $query = "UPDATE `#@__arctiny` SET `arcrank`='$arcrank', `typeid`='$typeid', `typeid2`='$typeid2', `sortrank`='$sortrank' WHERE id = '$id' ";
         $dsql->ExecuteNoneQuery($query);
-        //处理修改后的Tag
+        //处理修改后的tag
         if ($tags != '') {
             $oldtag = GetTags($id);
             $oldtags = explode(',', $oldtag);
             $tagss = explode(',', $tags);
             foreach ($tagss as $tag) {
                 $tag = trim($tag);
-                if (isset($tag[12]) || $tag != stripslashes($tag)) {
+                if (isset($tag[255]) || $tag != stripslashes($tag)) {
                     continue;
                 }
                 if (!in_array($tag, $oldtags)) {
@@ -184,11 +184,11 @@ if (!function_exists('UpIndexKey')) {
     }
 }
 /**
- *  插入Tags
+ *  插入tags
  *
  * @access    public
  * @param     string  $tag  标签
- * @param     int  $aid  文档AID
+ * @param     int  $aid  文档aid
  * @return    void
  */
 if (!function_exists('InsertTags')) {
@@ -197,7 +197,7 @@ if (!function_exists('InsertTags')) {
         $tags = explode(',', $tag);
         foreach ($tags as $tag) {
             $tag = trim($tag);
-            if (isset($tag[20]) || $tag != stripslashes($tag)) {
+            if (isset($tag[255]) || $tag != stripslashes($tag)) {
                 continue;
             }
             InsertOneTag($tag, $aid);
@@ -205,11 +205,11 @@ if (!function_exists('InsertTags')) {
     }
 }
 /**
- *  插入一个tag
+ *  插入tag
  *
  * @access    public
  * @param     string  $tag  标签
- * @param     int  $aid  文档AID
+ * @param     int  $aid  文档aid
  * @return    void
  */
 if (!function_exists('InsertOneTag')) {

src/theme/dedebiz/foot.htm

@@ -5,7 +5,7 @@
 	</div>
 </footer>
 <div class="scroll-top">
-	<button onclick="gotop()" id="btnScrollTop" title="返回顶部"><i class="fa fa-chevron-up"></i> </button>
+	<button onclick="gotop()" id="returntop" title="返回顶部"><i class="fa fa-chevron-up"></i> </button>
 </div>
 <script src="{dede:global.cfg_cmsurl/}/static/web/js/bootstrap.min.js"></script>
 <script src="{dede:global.cfg_cmsurl/}/static/web/js/style.js"></script>

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-sm 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++;
                 }

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-sm 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/soft_add.htm

@@ -10,6 +10,23 @@
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
 		<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
 		<script src="<?php echo $cfg_cmsurl;?>/static/web/js/user.js"></script>
+		<script>
+			var startNum = 2;
+			function MakeUpload() {
+				var upfield = document.getElementById("uploadfield");
+				var morelinkobj = document.getElementById("morelink");
+				var endNum = parseInt(document.addcontent.picnum.value) + startNum - 1;
+				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='' class='form-control' placeholder='请选择软件上传或填写软件网址'><div class='input-group-append'><span class='btn btn-success btn-sm btn-send' onclick=\"SelectSoft('addcontent.softurl"+startNum+"')\">选择</span></div></div><label>下载名称" + startNum + "：</label><input type='text' name='servermsg" + startNum + "' value='服务器" + startNum + "' class='form-control'></div>";
+				}
+			}
+			function ShowHideAddr() {
+				document.getElementById('morelink').style.display = (document.getElementById('morelink').style.display == 'block' ? 'none' : 'block');
+				document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏网址' : '显示网址');
+			}
+		</script>
 	</head>
 	<body class="body-bg">
 		<?php obtaintheme('top.htm');?>
@@ -130,7 +147,7 @@
 								</div>
 								<div class="form-group col-md-6">
 									<label for="officialUrl">演示网址</label>
-									<input type="text" name="officialDemo" id="officialUrl" value="http://" class="form-control">
+									<input type="text" name="officialDemo" id="officialUrl" value="" class="form-control">
 								</div>
 							</div>
 							<div class="form-row">
@@ -158,10 +175,10 @@
 								<div class="col-sm-10"><?php GetEditor("body","",400,"Member");?></div>
 							</div>
 							<div class="form-group">
-								<label>下载地址：</label>
+								<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-sm btn-send" onclick="SelectSoft('addcontent.softurl1')">选择</span></div>
 								</div>
 								<label>下载名称：</label>
 								<input type="text" name="servermsg1" id="servermsg1" class="form-control" value="本地下载">
@@ -169,8 +186,8 @@
 							<div class="form-group">
 								<span>其它地址：</span>
 								<input type="text" name="picnum" id="picnum" value="5" class="form-control w-25 mr-2">
-								<button type="button" name="kkkup" id="kkkup2" onclick="MakeUpload();" class="btn btn-success btn-sm">添加地址</button>
-								<button type="button" name="Submit3" id="btsh3" onclick="ShowHideAddr();" class="btn btn-success btn-sm">隐藏地址</button>
+								<button type="button" name="kkkup" id="kkkup2" onclick="MakeUpload();" class="btn btn-success btn-sm">添加网址</button>
+								<button type="button" name="Submit3" id="btsh3" onclick="ShowHideAddr();" class="btn btn-success btn-sm">隐藏网址</button>
 							</div>										
 							<div id="morelink" style="display:none">
 								<?php echo "<div id='uploadfield'></div>";?>
@@ -185,23 +202,6 @@
 			</div>
 		</main>
 		<?php obtaintheme('foot.htm');?>
-		<script>
-			var startNum = 2;
-			function MakeUpload() {
-				var upfield = document.getElementById("uploadfield");
-				var morelinkobj = document.getElementById("morelink");
-				var endNum = parseInt(document.addcontent.picnum.value) + startNum - 1;
-				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>";
-				}
-			}
-			function ShowHideAddr() {
-				document.getElementById('morelink').style.display = (document.getElementById('morelink').style.display == 'block' ? 'none' : 'block');
-				document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏地址' : '显示地址');
-			}
-		</script>
 		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>
 	</body>
 </html>

src/user/templets/soft_edit.htm

@@ -10,6 +10,23 @@
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
 		<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
 		<script src="<?php echo $cfg_cmsurl;?>/static/web/js/user.js"></script>
+		<script>
+			var startNum = 2;
+			function MakeUpload() {
+				var upfield = document.getElementById("uploadfield");
+				var morelinkobj = document.getElementById("morelink");
+				var endNum = parseInt(document.addcontent.picnum.value) + startNum - 1;
+				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='' class='form-control' placeholder='请选择软件上传或填写软件网址'><div class='input-group-append'><span class='btn btn-success btn-sm btn-send' onclick=\"SelectSoft('addcontent.softurl"+startNum+"')\">选择</span></div></div><label>下载名称" + startNum + "：</label><input type='text' name='servermsg" + startNum + "' value='服务器" + startNum + "' class='form-control'></div>";
+				}
+			}
+			function ShowHideAddr() {
+				document.getElementById('morelink').style.display = (document.getElementById('morelink').style.display == 'block' ? 'none' : 'block');
+				document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏网址' : '显示网址');
+			}
+		</script>
 	</head>
 	<body class="body-bg">
 		<?php obtaintheme('top.htm');?>
@@ -161,10 +178,10 @@
 								</div>
 							</div>
 							<div class="form-group">
-								<span>其它地址：</span>
+								<span>链接上传：</span>
 								<input type="text" name="picnum" id="picnum" value="5" class="form-control w-25">
-								<button type="button" name="kkkup" id="kkkup2" onclick="MakeUpload();" class="btn btn-success btn-sm">添加地址</button>
-								<button type="button" name="Submit3" id="btsh3" onclick="ShowHideAddr();" class="btn btn-success btn-sm">隐藏地址</button>
+								<button type="button" name="kkkup" id="kkkup2" onclick="MakeUpload();" class="btn btn-success btn-sm">添加网址</button>
+								<button type="button" name="Submit3" id="btsh3" onclick="ShowHideAddr();" class="btn btn-success btn-sm">隐藏网址</button>
 							</div>
 							<div id="morelink">
 								<?php
@@ -182,23 +199,6 @@
 			</div>
 		</main>
 		<?php obtaintheme('foot.htm');?>
-		<script>
-			var startNum = 2;
-			function MakeUpload() {
-				var upfield = document.getElementById("uploadfield");
-				var morelinkobj = document.getElementById("morelink");
-				var endNum = parseInt(document.addcontent.picnum.value) + startNum - 1;
-				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>";
-				}
-			}
-			function ShowHideAddr() {
-				document.getElementById('morelink').style.display = (document.getElementById('morelink').style.display == 'block' ? 'none' : 'block');
-				document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏地址' : '显示地址');
-			}
-		</script>
 		<?php include(DEDEMEMBER."/templets/widget_litpic.htm");?>
 	</body>
 </html>