优化上传文件，和文件扫描工具，调整二维码等等

src/admin/article_test_same.php

@@ -71,7 +71,7 @@ else if ($dopost == 'delsel') {
 }
 //向导页
 $channelinfos = array();
-$dsql->setquery("SELECT id,typename,maintable,addtable FROM `#@__channeltype` ");
+$dsql->setquery("SELECT id,typename,maintable,addtable FROM `#@__channeltype`");
 $dsql->execute();
 while ($row = $dsql->getarray()) $channelinfos[] = $row;
 include DedeInclude('templets/article_test_same.htm');

src/admin/diy_field_edit.php

@@ -104,7 +104,7 @@ else if ($action == "delete") {
     }
     $oksetting = addslashes($dtp->GetResultNP());
     $dsql->ExecuteNoneQuery("UPDATE `#@__diyforms` SET info='$oksetting' WHERE diyid='$diyid' ");
-    $dsql->ExecuteNoneQuery("ALTER TABLE `$trueTable` DROP `$fname` ");
+    $dsql->ExecuteNoneQuery("ALTER TABLE `$trueTable` DROP `$fname`");
     ShowMsg("成功删除一个字段", "diy_edit.php?diyid=$diyid");
     exit();
 }

src/admin/inc/inc_catalog_options.php

@@ -20,7 +20,7 @@
 function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0)
 {
     global $OptionArrayList, $channels, $dsql, $cfg_admin_channel, $admin_catalogs;
-    $dsql->SetQuery("SELECT id,typename FROM `#@__channeltype` ");
+    $dsql->SetQuery("SELECT id,typename FROM `#@__channeltype`");
     $dsql->Execute('dd');
     $channels = array();
     while ($row = $dsql->GetObject('dd')) $channels[$row->id] = $row->typename;

src/admin/makehtml_all.php

@@ -34,7 +34,7 @@ if ($action == '') {
     if ($step == 3) {
         include_once(DEDEINC."/archive/partview.class.php");
         $pv = new PartView();
-        $row = $pv->dsql->GetOne("SELECT * FROM `#@__homepageset` ");
+        $row = $pv->dsql->GetOne("SELECT * FROM `#@__homepageset`");
         $templet = str_replace("{style}", $cfg_df_style, $row['templet']);
         $homeFile = DEDEADMIN.'/'.$row['position'];
         $homeFile = str_replace("\\", '/', $homeFile);
@@ -123,7 +123,7 @@ function OptimizeData($dsql)
 {
     global $cfg_dbprefix;
     $tptables = array("{$cfg_dbprefix}archives", "{$cfg_dbprefix}arctiny");
-    $dsql->SetQuery("SELECT maintable,addtable FROM `#@__channeltype` ");
+    $dsql->SetQuery("SELECT maintable,addtable FROM `#@__channeltype`");
     $dsql->Execute();
     while ($row = $dsql->GetObject()) {
         $addtable = str_replace('#@__', $cfg_dbprefix, $row->addtable);

src/admin/makehtml_archives_action.php

@@ -51,7 +51,7 @@ if ($totalnum == 0) {
     $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` $idsql");
     $totalnum = $row['dd'];
     //清空缓存
-    $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache` ");
+    $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache`");
 }
 //获取记录，并更新网页
 if ($totalnum > $startdd + $pagesize) {

src/admin/makehtml_list_action.php

@@ -56,7 +56,7 @@ if (isset($idArray[$pageno])) {
 }
 if ($pageno == 0 && $mkpage == 1) //清空缓存
 {
-    $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache` ");
+    $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache`");
 }
 $reurl = '';
 //更新数组所记录栏目

src/admin/mychannel_field_edit.php

@@ -125,7 +125,7 @@ else if ($action == "delete") {
     }
     $oksetting = addslashes($dtp->GetResultNP());
     $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET fieldset='$oksetting' WHERE id='$id' ");
-    $dsql->ExecuteNoneQuery("ALTER TABLE `$trueTable` DROP `$fname` ");
+    $dsql->ExecuteNoneQuery("ALTER TABLE `$trueTable` DROP `$fname`");
     ShowMsg("成功删除一个字段", "mychannel_edit.php?id={$id}&dopost=edit&openfield=1");
     exit();
 }

src/admin/search_keywords_main.php

@@ -49,7 +49,7 @@ else if ($dopost == 'delall') {
 }
 //第一次进入这个页面
 if ($dopost == '') {
-    $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__search_keywords` ");
+    $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__search_keywords`");
     $totalRow = $row['dd'];
     include(DEDEADMIN."/templets/search_keywords_main.htm");
 }

src/admin/soft_add.php

@@ -26,7 +26,7 @@ if ($dopost != 'save') {
     } else {
         if ($channelid == 0) $channelid = 1;
     }
-    $softconfig = $dsql->GetOne("SELECT * FROM `#@__softconfig` ");
+    $softconfig = $dsql->GetOne("SELECT * FROM `#@__softconfig`");
     //获得栏目模型信息
     $cInfos = $dsql->GetOne("SELECT * FROM `#@__channeltype` WHERE id='$channelid' ");
     $channelid = $cInfos['id'];

src/admin/soft_config.php

@@ -20,7 +20,7 @@ if ($dopost == "save") {
     exit();
 }
 //读取参数
-$row = $dsql->GetOne("SELECT * FROM `#@__softconfig` ");
+$row = $dsql->GetOne("SELECT * FROM `#@__softconfig`");
 if (!is_array($row)) {
     $dsql->ExecuteNoneQuery("INSERT INTO `#@__softconfig` (`downtype`,`ismoresite`,`islocal`,`gotojump`,`sites`,`downmsg`,`moresitedo`,`dfrank`,`dfywboy`,`argrange`) VALUES ('1','0','1','0','','$downmsg','1','0','0','0'); ");
     $row['downtype']   = 1;

src/admin/sys_admin_user.php

@@ -14,7 +14,7 @@ require_once(DEDEINC."/datalistcp.class.php");
 setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/");
 if (empty($rank)) $rank = '';
 else $rank = " WHERE CONCAT(#@__admin.usertype)='$rank' ";
-$dsql->SetQuery("SELECT `rank`,typename FROM `#@__admintype` ");
+$dsql->SetQuery("SELECT `rank`,typename FROM `#@__admintype`");
 $dsql->Execute();
 while ($row = $dsql->GetObject()) {
     $adminRanks[$row->rank] = $row->typename;

src/admin/sys_data.php

@@ -38,7 +38,7 @@ if ($dopost == "viewinfo") //查看表结构
     if (empty($tablename)) {
         echo "没有指定表名";
     } else {
-        $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$tablename` ");
+        $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$tablename`");
         if ($rs) {
             echo "执行优化表<span class='text-primary'>$tablename</span>完成<br>";
         } else {
@@ -53,7 +53,7 @@ if ($dopost == "viewinfo") //查看表结构
     if (empty($tablename)) {
         echo "没有指定表名";
     } else {
-        $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `$tablename` ");
+        $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `$tablename`");
         if ($rs) {
             echo "修复表<span class='text-primary'>$tablename</span>完成<br>";
         } else {
@@ -67,7 +67,7 @@ if ($dopost == "viewinfo") //查看表结构
 $otherTables = array();
 $dedeSysTables = array();
 $channelTables = array();
-$dsql->SetQuery("SELECT addtable FROM `#@__channeltype` ");
+$dsql->SetQuery("SELECT addtable FROM `#@__channeltype`");
 $dsql->Execute();
 while ($row = $dsql->GetObject()) {
     $channelTables[] = $row->addtable;

src/admin/sys_data_done.php

@@ -112,7 +112,7 @@ if ($dopost == 'bak') {
         }
         $fsd = $j - 1;
         //读取表的文档
-        $dsql->SetQuery("SELECT * FROM `$nowtable` ");
+        $dsql->SetQuery("SELECT * FROM `$nowtable`");
         $dsql->Execute();
         $m = 0;
         $bakfilename = "$bkdir/{$nowtable}_{$startpos}_".substr(md5(time().mt_rand(1000, 5000).$cfg_cookie_encode), 0, 16).".txt";

src/admin/sys_repair.php

@@ -72,7 +72,7 @@ function 2_test_arctiny() {  }
 else if ($dopost == 2) {
     $msg = '';
     $allarcnum = 0;
-    $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__archives` ");
+    $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__archives`");
     $allarcnum = $arcnum = $row['dd'];
     $msg .= "#@__archives 表总记录数：{$arcnum}<br>";
     $shtables = array();
@@ -84,7 +84,7 @@ else if ($dopost == 2) {
         } else {
             if (!isset($shtables[$addtable])) {
                 $shtables[$addtable] = 1;
-                $row = $dsql->GetOne("SELECT COUNT(aid) AS dd FROM `$addtable` ");
+                $row = $dsql->GetOne("SELECT COUNT(aid) AS dd FROM `$addtable`");
                 $msg .= "{$addtable} 表总记录数：{$row['dd']} <br>";
                 $allarcnum += $row['dd'];
             }
@@ -92,7 +92,7 @@ else if ($dopost == 2) {
     }
     $msg .= "总有效记录数：{$allarcnum}<br>";
     $errall = "<a href='index_body.php' class='btn btn-success btn-sm'>完成修正</a>";
-    $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` ");
+    $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny`");
     $msg .= "微统计表记录数：{$row['dd']}<br>";
     if ($row['dd'] == $allarcnum) {
         $msg .= "<span class='text-dark'>两者记录一致，无需修正</span><br>";
@@ -109,7 +109,7 @@ else if ($dopost == 2) {
             $rs = $dsql->ExecuteNoneQuery($sql);
             $doarray[$tb]  = 1;
         }
-        $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` ");
+        $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny`");
         if ($row['dd'] == $allarcnum) {
             $msg .= "<span class='text-dark'>修正记录成功</span><br>";
         } else {

src/admin/sys_safetest.php

@@ -12,7 +12,7 @@ require_once(dirname(__FILE__).'/config.php');
 require_once(DEDEINC.'/libraries/dedehttpdown.class.php');
 CheckPurview('sys_Edit');
 if (empty($action)) $action = '';
-if (empty($message)) $message = '尚未进行检测……';
+if (empty($message)) $message = '尚未进行检测';
 if (empty($filetype)) $filetype = 'php|inc';
 if (empty($info)) $info = 'eval|cmd|system|exec|_GET|_POST|_REQUEST|base64_decode';
 $fileHashURL = "https://cdn.dedebiz.com/release/{$cfg_version_detail}.json";
@@ -25,7 +25,7 @@ foreach ($filelist as $key => $ff) {
 }
 $alter = "";
 if (count($offFiles) == 0) {
-    $alter = DedeAlert('无法同官方网站文件服务器通信，校验时候无法保证本地文件是否同官方服务器文件是否一致', ALERT_DANGER);
+    $alter = DedeAlert('<li>与官方文件服务器通信失败，校验时候无法保证本地文件和同官方文件服务器是否一致</li>', ALERT_DANGER);
 }
 function TestOneFile($f)
 {
@@ -47,12 +47,7 @@ function TestOneFile($f)
         if ($localFilehash === $remoteFilehash) {
             return 0;
         }
-        $message .= "<div style='clear:both'>
-        <div style='float:left;width:360px'>可疑文件：{$trfile}</div>
-        <a class='btn btn-success btn-sm' href='sys_safetest.php?action=viewdiff&filename=$oldTrfile' target='_blank'>修改记录</a>
-        <a class='btn btn-success btn-sm' href='file_manage_view.php?fmdo=del&filename=$oldTrfile&activepath=' target='_blank'>删除</a>
-        <a class='btn btn-success btn-sm' href='file_manage_view.php?fmdo=edit&filename=$oldTrfile&activepath=' target='_blank'>查看源码</a>
-        </div></div><hr>\r\n";
+        $message .= "<div><span class='float-left w-75'>发现可疑文件：{$trfile}</span><a href='sys_safetest.php?action=viewdiff&filename=$oldTrfile' target='_blank' class='btn btn-light btn-sm'><i class='fa fa-pencil-square-o'></i> 修改</a><a href='file_manage_view.php?fmdo=edit&filename=$oldTrfile&activepath=' target='_blank' class='btn btn-light btn-sm'><i class='fa fa-eye'></i> 查看</a><a href='file_manage_view.php?fmdo=del&filename=$oldTrfile&activepath=' target='_blank' class='btn btn-danger btn-sm'><i class='fa fa-trash'></i> 删除</a></div><hr>\r\n";
         return 1;
     }
     return 0;

src/admin/sys_sql_query.php

@@ -34,7 +34,7 @@ else if ($dopost == "opimize") {
     if (empty($tablename)) {
         echo "没有指定表名";
     } else {
-        $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$tablename` ");
+        $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$tablename`");
         if ($rs)  echo "执行优化表<span class='text-primary'>$tablename</span>完成<br>";
         else echo "执行优化表<span class='text-primary'>$tablename</span>失败，原因是：".$dsql->GetError();
     }
@@ -46,7 +46,7 @@ else if ($dopost == "opimizeAll") {
     $dsql->SetQuery("SHOW TABLES");
     $dsql->Execute('t');
     while ($row = $dsql->GetArray('t', MYSQL_BOTH)) {
-        $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `{$row[0]}` ");
+        $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `{$row[0]}`");
         if ($rs) {
             echo "优化表<span class='text-primary'>{$row[0]}</span>完成<br>";
         } else {
@@ -61,7 +61,7 @@ else if ($dopost == "repair") {
     if (empty($tablename)) {
         echo "没有指定表名";
     } else {
-        $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `$tablename` ");
+        $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `$tablename`");
         if ($rs) echo "修复表<span class='text-primary'>$tablename</span>完成<br>";
         else echo "修复表<span class='text-primary'>$tablename</span>失败，原因是：".$dsql->GetError();
     }
@@ -73,7 +73,7 @@ else if ($dopost == "repairAll") {
     $dsql->SetQuery("Show Tables");
     $dsql->Execute('t');
     while ($row = $dsql->GetArray('t', MYSQL_BOTH)) {
-        $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `{$row[0]}` ");
+        $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `{$row[0]}`");
         if ($rs) {
             echo "修复表<span class='text-primary'>{$row[0]}</span>完成<br>";
         } else {

src/admin/templets/article_description_main.htm

@@ -14,11 +14,6 @@
 				<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="360">栏目id：<input type="text" name="channel" id="channel" value="1" class="admin-input-xs">（可在“<a href="mychannel_main.php">栏目模型管理</a>”处获得）</td>
 					<td>摘要大小：<input type="text" name="dsize" id="dsize" value="<?php echo $cfg_auot_description?>" class="admin-input-xs">（最大250字节）</td>

src/admin/templets/file_manage_main.htm

@@ -281,7 +281,7 @@
             }
             ?>
             <tr>
-              <td bgcolor="#f5f5f5" colspan="4">
+              <td bgcolor="#f5f5f5" colspan="4" align="center">
                 <?php if (!DEDEBIZ_SAFE_MODE) {?><a href="file_manage_main.php" class="btn btn-success btn-sm">根目录</a><?php }?>
                 <a href="file_manage_view.php?fmdo=newfile&activepath=<?php echo urlencode($activepath)?>" class="btn btn-success btn-sm">新建文件</a>
                 <a href="file_manage_view.php?fmdo=newdir&activepath=<?php echo urlencode($activepath)?>" class="btn btn-success btn-sm">新建目录</a>

src/admin/templets/index_body.htm

@@ -36,21 +36,21 @@
 									<td width="20%" class="border-top-0">访问次数(VV)</td>
 								</tr>
 								<tr class="bg-white">
-									<td class="today">今日</td>
+									<td class="today">今日记录</td>
 									<td class="today" id="today_pv">0</td>
 									<td class="today" id="today_uv">0</td>
 									<td class="today" id="today_ip">0</td>
 									<td class="today" id="today_vv">0</td>
 								</tr>
 								<tr class="bg-white">
-									<td>昨日</td>
+									<td>昨日记录</td>
 									<td id="yestoday_pv">0</td>
 									<td id="yestoday_uv">0</td>
 									<td id="yestoday_ip">0</td>
 									<td id="yestoday_vv">0</td>
 								</tr>
 								<tr class="bg-white">
-									<td>历史累计</td>
+									<td>历史记录</td>
 									<td id="total_pv">0</td>
 									<td id="total_uv">0</td>
 									<td id="total_ip">0</td>

src/admin/templets/media_add.htm

@@ -24,7 +24,7 @@
 				var endNum = Number(document.form1.picnum.value) + startNum;
 				if (endNum > 40) endNum = 40;
 				for (startNum; startNum <= endNum; startNum++) {
-					upfield.innerHTML += "<input type='file' name='upfile" + startNum + "' class='admin-input-md'><br>";
+					upfield.innerHTML += "<p><input type='file' name='upfile" + startNum + "' class='admin-input-md'></p>";
 				}
 			}
 			function ResetUpload() {
@@ -67,10 +67,6 @@
 					<td class="admin-td">说明标题：</td>
 					<td class="admin-td"><input type="text" name="title" id="title" class="admin-input-md"></td>
 				</tr>
-				<tr>
-					<td class="admin-td">参数说明：</td>
-					<td class="admin-td" colspan="2">图片不需要指定“宽”、“高”，其它附加参数仅方便多媒体文件管理，没其它含义</td>
-				</tr>
 				<tr>
 					<td class="admin-td">附加参数：</td>
 					<td class="admin-td">
@@ -90,11 +86,11 @@
 				<tr>
 					<td></td>
 					<td>
-						<input type="file" name="upfile1" id="upfile1" class="admin-input-md"><br>
-						<input type="file" name="upfile2" id="upfile2" class="admin-input-md"><br>
-						<input type="file" name="upfile3" id="upfile3" class="admin-input-md"><br>
-						<input type="file" name="upfile4" id="upfile4" class="admin-input-md"><br>
-						<input type="file" name="upfile5" id="upfile5" class="admin-input-md"><br>
+						<p><input type="file" name="upfile1" id="upfile1" class="admin-input-md"></p>
+						<p><input type="file" name="upfile2" id="upfile2" class="admin-input-md"></p>
+						<p><input type="file" name="upfile3" id="upfile3" class="admin-input-md"></p>
+						<p><input type="file" name="upfile4" id="upfile4" class="admin-input-md"></p>
+						<p><input type="file" name="upfile5" id="upfile5" class="admin-input-md"></p>
 						<span id="uploadfield"></span>
 					</td>
 				</tr>

src/admin/templets/media_edit.htm

@@ -54,10 +54,6 @@
 					<td class="admin-td">说明标题：</td>
 					<td class="admin-td"><input type="text" name="title" id="title" value="<?php echo $myrow['title']?>" class="admin-input-md"></td>
 				</tr>
-				<tr>
-					<td class="admin-td">参数说明：</td>
-					<td class="admin-td" colspan="2">图片不需要指定“宽”、“高”，其它附加参数仅方便多媒体文件管理，没其它含义</td>
-				</tr>
 				<tr>
 					<td class="admin-td">附加参数：</td>
 					<td class="admin-td">
@@ -67,7 +63,7 @@
 					</td>
 				</tr>
 				<tr>
-					<td class="admin-td">原文件：</td>
+					<td class="admin-td">源文件：</td>
 					<td class="admin-td">
 						<input type="text" name="filename" id="filename" value="<?php echo $myrow['url']?>" class="admin-input-md">
 						<a href="<?php echo $myrow['url']?>" target="_blank" class="btn btn-success btn-sm">查看</a>

src/admin/templets/module_main.htm

@@ -43,7 +43,7 @@
 				</tr>
 				<tr>
 					<td colspan="6">
-						<div class="alert alert-info mb-0">为了保障模块插件开发和技术的安全隐私，增加了<a href="<?php echo $cfg_biz_dedebizUrl;?>/license_developer" target="_blank">DedeBIZ商业开发者计划</a>，模块插件认准DedeBIZ商业认证开发者</div>
+						<div class="alert alert-info mb-0">为了模块插件开发者的利益和模块插件后续更新，增加了<a href="<?php echo $cfg_biz_dedebizUrl;?>/license_developer" target="_blank">DedeBIZ商业开发者计划</a>，模块插件认准DedeBIZ商业认证开发者</div>
 					</td>
 				</tr>
 				<tr bgcolor="#e9ecef" align="center">

src/admin/templets/sys_admin_user.htm

@@ -31,12 +31,12 @@
 				</td>
 			</tr>
 			<tr bgcolor="#e9ecef" align="center">
-				<td width="20%">id</td>
+				<td width="10%">id</td>
 				<td width="20%">名称</td>
-				<td width="10%">等级</td>
+				<td width="20%">等级</td>
 				<td width="16%">地址时间</td>
 				<td width="16%">栏目</td>
-				<td align="center">操作</td>
+				<td>操作</td>
 			</tr>
 			{dede:datalist empty='<tr><td colspan="6" align="center">暂无文档</td></tr>'}
 			<tr align="center">

src/admin/templets/sys_group.htm

@@ -26,9 +26,9 @@
 					</td>
 				</tr>
 				<tr bgcolor="#e9ecef" align="center">
-					<td width="20%">等级</td>
-					<td width="45%">组名称</td>
-					<td width="35%">管理</td>
+					<td width="6%">等级</td>
+					<td width="60%">组名称</td>
+					<td>管理</td>
 				</tr>
 				<?php
 				$dsql->SetQuery("Select `rank`,typename,`system` From `#@__admintype`");

src/admin/templets/sys_info_mark.htm

@@ -17,7 +17,7 @@
 					<td bgcolor="#f5f5f5" colspan="2">图片水印设置</td>
 				</tr>
 				<tr>
-					<td width="50%">上传的图片是否使用图片水印功能：</td>
+					<td width="260">上传的图片是否使用图片水印功能：</td>
 					<td>
 						<label><input type="radio" value="1" name="get_photo_markup" <?php if ($photo_markup=='1') echo ' checked';?>> 开启</label>
 						<label><input type="radio" value="0" name="get_photo_markup" <?php if ($photo_markup=='0') echo ' checked';?>> 关闭</label>
@@ -39,45 +39,46 @@
 					</td>
 				</tr>
 				<tr>
-					<td>添加水印的图片大小控制（设置为0为不限）：</td>
+					<td>添加水印的图片大小控制：</td>
 					<td>
-						宽：<input name="get_photo_wwidth" type=text id="get_photo_wwidth" value="<?php echo $photo_wwidth?>" class="admin-input-sm">
-						高：<input name="get_photo_wheight" type=text id="get_photo_wheight" value="<?php echo $photo_wheight?>" class="admin-input-sm">
+						<span>宽：<input name="get_photo_wwidth" type=text id="get_photo_wwidth" value="<?php echo $photo_wwidth?>" class="admin-input-sm"></span>
+						<span>高：<input name="get_photo_wheight" type=text id="get_photo_wheight" value="<?php echo $photo_wheight?>" class="admin-input-sm"></span>
+						<span>（设置为0为不限）</span>
 					</td>
 				</tr>
 				<tr>
-					<td>水印图片文件名（如果不存在，则使用文字水印）：</td>
-					<td><img src="../data/mark/<?php echo $photo_markimg;?>"></td>
+					<td>水印图片文件名：</td>
+					<td><img src="../data/mark/<?php echo $photo_markimg;?>">（如果不存在，则使用文字水印）</td>
 				</tr>
 				<tr>
 					<td>上传新图片：</td>
-					<td><input name="newimg" type="file" id="newimg" class="admin-input-md"> <?php echo "支持的图片格式：gif png";?></td>
+					<td><input name="newimg" type="file" id="newimg" class="admin-input-md">（支持gif和png图片格式）</td>
 				</tr>
 				<tr>
-					<td>水印图片文字：请查看data\mark\simhei.ttf字体库是否存在</td>
-					<td><input type="text" name="get_photo_watertext" value="<?php echo $photo_watertext?>" class="admin-input-sm"></td>
+					<td>水印图片文字：</td>
+					<td><input type="text" name="get_photo_watertext" value="<?php echo $photo_watertext?>" class="admin-input-sm">（查看data\mark\simhei.ttf字体库是否存在）</td>
 				</tr>
 				<tr>
 					<td>水印图片文字字体大小：</td>
 					<td><input name="get_photo_fontsize" type=text id="get_photo_fontsize" value="<?php echo $photo_fontsize?>" class="admin-input-sm"></td>
 				</tr>
 				<tr>
-					<td>水印图片文字颜色（默认#dc3545为红色）：</td>
+					<td>水印图片文字颜色：</td>
 					<td><input name="get_photo_fontcolor" type=text id="get_photo_fontcolor" value="<?php echo $photo_fontcolor?>" class="admin-input-sm"></td>
 				</tr>
 				<tr>
-					<td>设置JPEG类型的图片附件添加水印后质量参数，范围为0～100的整数，数值越大结果图片效果越好，但尺寸也越大</td>
-					<td><input type="text" name="get_photo_marktrans" id="get_photo_marktrans" value="<?php echo $photo_marktrans?>" class="admin-input-sm"></td>
+					<td>设置JPEG类型图片附件添加水印后质量</td>
+					<td><input type="text" name="get_photo_marktrans" id="get_photo_marktrans" value="<?php echo $photo_marktrans?>" class="admin-input-sm">（范围为0～100的整数，数值越大结果图片效果越好，但尺寸也越大）</td>
 				</tr>
 				<tr>
-					<td>设置GIF类型水印图片与原始图片的融合度,水印透明度（0—100，值越小越透明）</td>
-					<td><input name="get_photo_diaphaneity" type=text id="get_photo_diaphaneity" value="<?php echo $photo_diaphaneity?>" class="admin-input-sm"></td>
+					<td>设置GIF类型水印图片与原始图片透明度</td>
+					<td><input name="get_photo_diaphaneity" type=text id="get_photo_diaphaneity" value="<?php echo $photo_diaphaneity?>" class="admin-input-sm">（0—100，值越小越透明）</td>
 				</tr>
 				<tr>
 					<td>水印位置：</td>
 					<td>
 						<label><input type="radio" name="get_photo_waterpos" value="0" <?php if ($photo_waterpos==0) echo ' checked';?>> 随机位置</label>
-						<table border="1" cellspacing="0" cellpadding="0" class="table maintable">
+						<table cellspacing="0" cellpadding="0" class="w-25 mt-2">
 							<tr>
 								<td width="33%">
 									<label><input type="radio" name="get_photo_waterpos" value="1" <?php if ($photo_waterpos==1) echo ' checked';?>> 顶部居左</label>

src/admin/templets/sys_payment.htm

@@ -1,225 +1,194 @@
 <!DOCTYPE html>
 <html>
-
-<head>
-	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-	<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">
-	<script src="../static/web/js/jquery.min.js"></script>
-	<script src="../static/web/js/bootstrap.min.js"></script>
-</head>
-
-<body>
-	<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
-		<tr>
-			<td bgcolor="#f5f5f5" colspan="4">
-				<table cellspacing="0" cellpadding="0" class="table table-borderless w-100">
-					<tr>
-						<td>支付接口设置</td>
-						<td align="right"><span><a href="https://www.dedebiz.com/help" target="_blank"
-									class="btn btn-success btn-sm">更多接口</a></span></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">
-				<ul class="nav nav-tabs" id="myTab" role="tablist">
-					<li class="nav-item" role="presentation">
-						<button type="button" id="wechat-tab" class="nav-link active" data-toggle="tab"
-							data-target="#wechat" role="tab" aria-controls="wechat" aria-selected="true">微信支付</button>
-					</li>
-					<li class="nav-item" role="presentation">
-						<button type="button" id="alipay-tab" class="nav-link" data-toggle="tab" data-target="#alipay"
-							role="tab" aria-controls="alipay" aria-selected="false">支付宝</button>
-					</li>
-					<li class="nav-item" role="presentation">
-						<button type="button" id="bank-tab" class="nav-link" data-toggle="tab" data-target="#bank"
-							role="tab" aria-controls="bank" aria-selected="false">银行转帐</button>
-					</li>
-					<li class="nav-item" role="presentation">
-						<button type="button" id="balance-tab" class="nav-link" data-toggle="tab" data-target="#balance"
-							role="tab" aria-controls="balance" aria-selected="false">余额支付</button>
-					</li>
-					<li class="nav-item" role="presentation">
-						<button type="button" id="cod-tab" class="nav-link" data-toggle="tab" data-target="#cod"
-							role="tab" aria-controls="cod" aria-selected="false">货到付款</button>
-					</li>
-				</ul>
-				<div class="tab-content py-3" id="myTabContent">
-					<div class="tab-pane fade show active" id="wechat" role="tabpanel" aria-labelledby="wechat-tab">
-						<form>
-							<div class="form-group">
-								<label>描述</label>
-								<p>微信支付是腾讯公司的支付业务品牌，微信支付商户平台支持线下场所、公众号、小程序、PC网站、APP、企业微信等经营场景快速接入微信支付。微信支付全面打通O2O生活消费领域，提供专业的互联网+行业解决方案，微信支付支持微信红包和微信理财通，是移动支付的首选。
-								</p>
-							</div>
-							<div class="form-group">
-								<label for="iptWechatAppID">AppID</label>
-								<input type="text" class="form-control" id="iptWechatAppID">
-							</div>
-							<div class="form-group">
-								<label for="iptWechatAppSecret">AppSecret</label>
-								<input type="text" class="form-control" id="iptWechatAppSecret">
-							</div>
-							<div class="form-group">
-								<label for="iptWechatMchID">商户号</label>
-								<input type="text" class="form-control" id="iptWechatMchID">
-							</div>
-							<div class="form-group">
-								<label for="iptWechatAPIV3Key">APIv3秘钥</label>
-								<input type="text" class="form-control" id="iptWechatAPIV3Key">
-							</div>
-							<div class="form-group">
-								<label for="iptWechatSerialNo">商户证书序列号</label>
-								<input type="text" class="form-control" id="iptWechatSerialNo">
-							</div>
-							<div class="form-group">
-								<label>商户证书文件</label>
-								<div class="custom-file">
-									<input type="file" class="custom-file-input" id="iptWechatPrivateKey">
-									<label class="custom-file-label" data-browse="选择"
-										for="iptWechatPrivateKey">选择商户证书文件...</label>
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+		<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">
+		<script src="../static/web/js/jquery.min.js"></script>
+		<script src="../static/web/js/bootstrap.min.js"></script>
+	</head>
+	<body>
+		<table cellpadding="3" cellspacing="1" align="center" class="table maintable my-3">
+			<tr>
+				<td bgcolor="#f5f5f5" colspan="4">
+					<table cellspacing="0" cellpadding="0" class="table table-borderless w-100">
+						<tr>
+							<td>支付接口设置</td>
+							<td align="right"><span><a href="https://www.dedebiz.com/help" target="_blank" class="btn btn-success btn-sm">更多接口</a></span></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="4">
+					<ul class="nav nav-tabs" id="myTab" role="tablist">
+						<li class="nav-item" role="presentation"><button type="button" id="wechat-tab" class="nav-link active" data-toggle="tab"	data-target="#wechat" role="tab" aria-controls="wechat" aria-selected="true">微信支付</button></li>
+						<li class="nav-item" role="presentation"><button type="button" id="alipay-tab" class="nav-link" data-toggle="tab" data-target="#alipay" role="tab" aria-controls="alipay" aria-selected="false">支付宝</button></li>
+						<li class="nav-item" role="presentation"><button type="button" id="bank-tab" class="nav-link" data-toggle="tab" data-target="#bank" role="tab" aria-controls="bank" aria-selected="false">银行转帐</button></li>
+						<li class="nav-item" role="presentation"><button type="button" id="balance-tab" class="nav-link" data-toggle="tab" data-target="#balance" role="tab" aria-controls="balance" aria-selected="false">余额支付</button></li>
+						<li class="nav-item" role="presentation"><button type="button" id="cod-tab" class="nav-link" data-toggle="tab" data-target="#cod" role="tab" aria-controls="cod" aria-selected="false">货到付款</button></li>
+					</ul>
+					<div class="tab-content py-3" id="myTabContent">
+						<div class="tab-pane fade show active" id="wechat" role="tabpanel" aria-labelledby="wechat-tab">
+							<form>
+								<div class="form-group">
+									<span>微信支付是腾讯公司的支付业务品牌，微信支付商户平台支持线下场所、公众号、小程序、PC网站、APP、企业微信等经营场景快速接入微信支付。微信支付全面打通O2O生活消费领域，提供专业的互联网+行业解决方案，微信支付支持微信红包和微信理财通，是移动支付的首选。</span>
 								</div>
-							</div>
-							<div class="form-group">
-								<label for="iptWechatSortrank">排序（越小越靠前）</label>
-								<input type="text" class="form-control" id="iptWechatSortrank" value="0">
-							</div>
-							<div class="form-group form-check">
-								<input type="checkbox" class="form-check-input" id="iptWechatEnabled">
-								<label class="form-check-label" for="iptWechatEnabled"> 是否启用</label>
-							</div>
-						</form>
-					</div>
-					<div class="tab-pane fade" id="alipay" role="tabpanel" aria-labelledby="alipay-tab">
-						<form>
-							<div class="form-group">
-								<label for="iptAppID">描述</label>
-								<p>支付宝，全球领先的独立第三方支付平台，致力于为广大用户提供安全快速的电子支付/网上支付/安全支付/手机支付体验，及转账收款/水电煤缴费/信用卡还款/AA收款等生活服务应用。
-								</p>
-							</div>
-							<div class="form-group">
-								<label for="iptAlipayAPPID">APPID</label>
-								<input type="text" class="form-control" id="iptAlipayAPPID">
-							</div>
-							<div class="form-group">
-								<label for="iptAlipayPrivateKey">应用私钥</label>
-								<input type="text" class="form-control" id="iptAlipayPrivateKey">
-							</div>
-							<div class="form-group">
-								<label>应用公钥证书</label>
-								<div class="custom-file">
-									<input type="file" class="custom-file-input" id="iptAlipayAppCertPublicKey">
-									<label class="custom-file-label" data-browse="选择"
-										for="iptAlipayAppCertPublicKey">选择应用公钥证书文件...</label>
+								<div class="form-group">
+									<label for="iptWechatAppID">AppID</label>
+									<input type="text" id="iptWechatAppID" class="form-control">
 								</div>
-							</div>
-							<div class="form-group">
-								<label>支付宝公钥证书</label>
-								<div class="custom-file">
-									<input type="file" class="custom-file-input" id="iptAlipayCertPublicKey">
-									<label class="custom-file-label" data-browse="选择"
-										for="iptAlipayCertPublicKey">选择支付宝公钥证书文件...</label>
+								<div class="form-group">
+									<label for="iptWechatAppSecret">AppSecret</label>
+									<input type="text" id="iptWechatAppSecret" class="form-control">
 								</div>
-							</div>
-							<div class="form-group">
-								<label>支付宝根证书</label>
-								<div class="custom-file">
-									<input type="file" class="custom-file-input" id="iptAlipayRootCert">
-									<label class="custom-file-label" data-browse="选择"
-										for="iptAlipayRootCert">选择支付宝根证书文件...</label>
+								<div class="form-group">
+									<label for="iptWechatMchID">商户号</label>
+									<input type="text" id="iptWechatMchID" class="form-control">
 								</div>
-							</div>
-							<div class="form-group">
-								<label for="iptAlipaySignType">签名类型</label>
-								<input type="text" class="form-control" id="iptAlipaySignType" value="RSA2" disabled>
-							</div>
-							<div class="form-group">
-								<label for="iptAlipaySortrank">排序（越小越靠前）</label>
-								<input type="text" class="form-control" id="iptAlipaySortrank" value="0">
-							</div>
-							<div class="form-group form-check">
-								<input type="checkbox" class="form-check-input" id="iptAlipayEnabled">
-								<label class="form-check-label" for="iptAlipayEnabled"> 是否启用</label>
-							</div>
-						</form>
-					</div>
-					<div class="tab-pane fade" id="bank" role="tabpanel" aria-labelledby="bank-tab">
-						<form>
-							<div class="form-group">
-								<label>描述</label>
-								<p>用户支付到商户指定银行卡账号，手动确认订单收款。</p>
-							</div>
-							<div class="form-group">
-								<label for="iptBankAccountName">账户名</label>
-								<input type="text" class="form-control" id="iptBankAccountName">
-							</div>
-							<div class="form-group">
-								<label for="iptBankAccountNO">账号</label>
-								<input type="text" class="form-control" id="iptBankAccountNO">
-							</div>
-							<div class="form-group">
-								<label for="iptBankName">开户行</label>
-								<input type="text" class="form-control" id="iptBankName">
-							</div>
-							<div class="form-group">
-								<label for="iptBankSortrank">排序（越小越靠前）</label>
-								<input type="text" class="form-control" id="iptBankSortrank" value="0">
-							</div>
-							<div class="form-group form-check">
-								<input type="checkbox" class="form-check-input" id="iptBankEnabled">
-								<label class="form-check-label" for="iptBankEnabled"> 是否启用</label>
-							</div>
-						</form>
-					</div>
-					<div class="tab-pane fade" id="balance" role="tabpanel" aria-labelledby="balance-tab">
-						<form>
-							<div class="form-group">
-								<label>描述</label>
-								<p>支持采用积分进行支付。</p>
-							</div>
-							<div class="form-group">
-								<label for="iptBalanceSortrank">排序（越小越靠前）</label>
-								<input type="text" class="form-control" id="iptBalanceSortrank" value="0">
-							</div>
-							<div class="form-group form-check">
-								<input type="checkbox" class="form-check-input" id="iptBalanceEnabled">
-								<label class="form-check-label" for="iptBalanceEnabled">是否启用</label>
-							</div>
-						</form>
-					</div>
-					<div class="tab-pane fade" id="cod" role="tabpanel" aria-labelledby="cod-tab">
-						<form>
-							<div class="form-group">
-								<label>描述</label>
-								<p>购买后直接发货，到货后再进行支付。</p>
-							</div>
-							<div class="form-group">
-								<label for="iptCodSortrank">排序（越小越靠前）</label>
-								<input type="text" class="form-control" id="iptCodSortrank" value="0">
-							</div>
-							<div class="form-group form-check">
-								<input type="checkbox" class="form-check-input" id="iptCodEnabled">
-								<label class="form-check-label" for="iptCodEnabled"> 是否启用</label>
-							</div>
-						</form>
-					</div>
-					<div class="text-center"><button id="btnSave" type="submit" class="btn btn-success">保存</button>
+								<div class="form-group">
+									<label for="iptWechatAPIV3Key">APIv3秘钥</label>
+									<input type="text" id="iptWechatAPIV3Key" class="form-control">
+								</div>
+								<div class="form-group">
+									<label for="iptWechatSerialNo">商户证书序列号</label>
+									<input type="text" id="iptWechatSerialNo" class="form-control">
+								</div>
+								<div class="form-group">
+									<label>商户证书文件</label>
+									<div class="custom-file">
+										<input type="file" id="iptWechatPrivateKey" class="custom-file-input">
+										<label class="custom-file-label" for="iptWechatPrivateKey" data-browse="选择">选择商户证书文件</label>
+									</div>
+								</div>
+								<div class="form-group">
+									<label for="iptWechatSortrank">排序（越小越靠前）</label>
+									<input type="text" id="iptWechatSortrank" class="form-control" value="0">
+								</div>
+								<div class="form-group form-check">
+									<input type="checkbox" id="iptWechatEnabled" class="form-check-input">
+									<label class="form-check-label" for="iptWechatEnabled"> 是否启用</label>
+								</div>
+							</form>
+						</div>
+						<div class="tab-pane fade" id="alipay" role="tabpanel" aria-labelledby="alipay-tab">
+							<form>
+								<div class="form-group">
+									<span>支付宝，全球领先的独立第三方支付平台，致力于为广大用户提供安全快速的电子支付/网上支付/安全支付/手机支付体验，及转账收款/水电煤缴费/信用卡还款/AA收款等生活服务应用。</span>
+								</div>
+								<div class="form-group">
+									<label for="iptAlipayAPPID">APPID</label>
+									<input type="text" id="iptAlipayAPPID" class="form-control">
+								</div>
+								<div class="form-group">
+									<label for="iptAlipayPrivateKey">应用私钥</label>
+									<input type="text" id="iptAlipayPrivateKey" class="form-control">
+								</div>
+								<div class="form-group">
+									<label>应用公钥证书</label>
+									<div class="custom-file">
+										<input type="file" id="iptAlipayAppCertPublicKey" class="custom-file-input">
+										<label class="custom-file-label" for="iptAlipayAppCertPublicKey" data-browse="选择">选择应用公钥证书文件</label>
+									</div>
+								</div>
+								<div class="form-group">
+									<label>支付宝公钥证书</label>
+									<div class="custom-file">
+										<input type="file" id="iptAlipayCertPublicKey" class="custom-file-input">
+										<label class="custom-file-label" for="iptAlipayCertPublicKey" data-browse="选择">选择支付宝公钥证书文件</label>
+									</div>
+								</div>
+								<div class="form-group">
+									<label>支付宝根证书</label>
+									<div class="custom-file">
+										<input type="file" class="custom-file-input" id="iptAlipayRootCert">
+										<label class="custom-file-label" for="iptAlipayRootCert" data-browse="选择">选择支付宝根证书文件</label>
+									</div>
+								</div>
+								<div class="form-group">
+									<label for="iptAlipaySignType">签名类型</label>
+									<input type="text" id="iptAlipaySignType" class="form-control" value="RSA2" disabled>
+								</div>
+								<div class="form-group">
+									<label for="iptAlipaySortrank">排序（越小越靠前）</label>
+									<input type="text" id="iptAlipaySortrank" class="form-control" value="0">
+								</div>
+								<div class="form-group form-check">
+									<input type="checkbox" id="iptAlipayEnabled" class="form-check-input">
+									<label class="form-check-label" for="iptAlipayEnabled"> 是否启用</label>
+								</div>
+							</form>
+						</div>
+						<div class="tab-pane fade" id="bank" role="tabpanel" aria-labelledby="bank-tab">
+							<form>
+								<div class="form-group">
+									<span>用户支付到商户指定银行卡账号，手动确认订单收款。</span>
+								</div>
+								<div class="form-group">
+									<label for="iptBankAccountName">账户名</label>
+									<input type="text" id="iptBankAccountName" class="form-control">
+								</div>
+								<div class="form-group">
+									<label for="iptBankAccountNO">账号</label>
+									<input type="text" id="iptBankAccountNO" class="form-control">
+								</div>
+								<div class="form-group">
+									<label for="iptBankName">开户行</label>
+									<input type="text" id="iptBankName" class="form-control">
+								</div>
+								<div class="form-group">
+									<label for="iptBankSortrank">排序（越小越靠前）</label>
+									<input type="text" id="iptBankSortrank" class="form-control" value="0">
+								</div>
+								<div class="form-group form-check">
+									<input type="checkbox" id="iptBankEnabled" class="form-check-input">
+									<label class="form-check-label" for="iptBankEnabled"> 是否启用</label>
+								</div>
+							</form>
+						</div>
+						<div class="tab-pane fade" id="balance" role="tabpanel" aria-labelledby="balance-tab">
+							<form>
+								<div class="form-group">
+									<span>支持采用积分进行支付。</span>
+								</div>
+								<div class="form-group">
+									<label for="iptBalanceSortrank">排序（越小越靠前）</label>
+									<input type="text" id="iptBalanceSortrank" class="form-control" value="0">
+								</div>
+								<div class="form-group form-check">
+									<input type="checkbox" id="iptBalanceEnabled" class="form-check-input">
+									<label class="form-check-label" for="iptBalanceEnabled">是否启用</label>
+								</div>
+							</form>
+						</div>
+						<div class="tab-pane fade" id="cod" role="tabpanel" aria-labelledby="cod-tab">
+							<form>
+								<div class="form-group">
+									<span>购买后直接发货，到货后再进行支付。</span>
+								</div>
+								<div class="form-group">
+									<label for="iptCodSortrank">排序（越小越靠前）</label>
+									<input type="text" id="iptCodSortrank" class="form-control" value="0">
+								</div>
+								<div class="form-group form-check">
+									<input type="checkbox" id="iptCodEnabled" class="form-check-input">
+									<label class="form-check-label" for="iptCodEnabled"> 是否启用</label>
+								</div>
+							</form>
+						</div>
+						<div class="text-center"><button type="submit" id="btnSave" class="btn btn-success">保存</button></div>
 					</div>
-				</div>
-			</td>
-		</tr>
-	</table>
-	<script>
+				</td>
+			</tr>
+		</table>
+		<script>
 		$('.custom-file-input').on('change', function () {
 			let fileName = $(this).val().split('\\').pop();
 			$(this).siblings('.custom-file-label').addClass("selected").html(fileName);
 		});
-
 		let config = {
 			Wechat: {
 				AppID: '',
@@ -257,7 +226,6 @@
 				Enabled: true,
 			}
 		}
-
 		//加载系统config
 		function getPayments() {
 			$.get("sys_payment.php?dopost=get_payments", function (data) {
@@ -298,7 +266,6 @@
 				}
 			})
 		}
-
 		//更新config
 		function updateConfig() {
 			for (const key in config) {
@@ -322,7 +289,6 @@
 				}
 			}
 		}
-
 		//保存配置信息
 		function saveConfig() {
 			$.ajax({
@@ -336,17 +302,14 @@
 				}
 			})
 		}
-
 		$(document).ready(function () {
-				getPayments();
-				$("#btnSave").click(() => {
-					updateConfig()
-					saveConfig();
-					console.log(config)
-				})
+			getPayments();
+			$("#btnSave").click(() => {
+				updateConfig()
+				saveConfig();
+				console.log(config)
 			})
-
-	</script>
-</body>
-
+		})
+		</script>
+	</body>
 </html>

src/admin/templets/sys_safetest.htm

@@ -50,7 +50,15 @@
 				<td bgcolor="#f5f5f5">文件扫描工具</td>
 			</tr>
 			<tr>
-				<td><?php echo $alter;?></td>
+				<td>
+					<div class="alert alert-info mb-0">
+						<ul>
+							<?php echo $alter;?>
+							<li>检测结果：结果仅供参考，请务必查看源码后才删除非法文件</li>
+							<li>安全建议：1、有条件的用户把data、system、theme修改为不可对外浏览，static、a目录设置为不允许执行脚本，其它目录禁止写入，系统更安全；2、本检测程以开发模式为标准，如果您的网站目录包含其它系统，此检测程序可能会产生错误判断；3、检测程序会跳过对模板缓存目录的检测，为了安全起见，检测完成后建议清空模板缓存</li>
+						</ul>
+					</div>
+				</td>
 			</tr>
 			<tr>
 				<td>
@@ -58,10 +66,6 @@
 					<span>代码特征：<input type="text" name="info" id="info" value="eval|cmd|system|exec|_GET|_POST|_REQUEST|base64_decode" class="admin-input-lg"></span>
 				</td>
 			</tr>
-			<tr>
-				<td>检测结果：结果仅供参考，请务必查看源码后才删除非法文件<br>
-					安全建议：1、有条件的用户把data、system、theme修改为不可对外浏览，static、a目录设置为不允许执行脚本，其它目录禁止写入，系统更安全；2、本检测程以开发模式为标准，如果您的网站目录包含其它系统，此检测程序可能会产生错误判断；3、检测程序会跳过对模板缓存目录的检测，为了安全起见，检测完成后建议清空模板缓存</td>
-			</tr>
 			<tr>
 				<td align="center" bgcolor="#e9ecef">
 					<button type="button" name="bt1" class="btn btn-success btn-sm" onclick="LoadCtTest();">开始检测</button>

src/admin/templets_one_add.php

@@ -41,7 +41,7 @@ if ($dopost == "save") {
     ShowMsg("成功增加一个页面", "templets_one.php");
     exit();
 }
-$row = $dsql->GetOne("SELECT MAX(aid) AS aid FROM `#@__sgpage` ");
+$row = $dsql->GetOne("SELECT MAX(aid) AS aid FROM `#@__sgpage`");
 $nowid = is_array($row) ? $row['aid'] + 1 : '';
 include_once(DEDEADMIN."/templets/templets_one_add.htm");
 ?>

src/admin/templets_one_edit.php

@@ -60,7 +60,7 @@ if ($dopost == "saveedit") {
     exit();
 } else if ($dopost == "mkall") {
     include_once(DEDEINC."/archive/sgpage.class.php");
-    $dsql->Execute("ex", "SELECT aid FROM `#@__sgpage` ");
+    $dsql->Execute("ex", "SELECT aid FROM `#@__sgpage`");
     $i = 0;
     while ($row = $dsql->GetArray("ex")) {
         $sg = new sgpage($row['aid']);

src/apps/download.php

@@ -59,7 +59,7 @@ else if ($open == 1) {
         $query = " INSERT INTO `#@__downloads` (`hash`,`id`,`downloads`) VALUES ('$hash','$id',1); ";
         $dsql->ExecNoneQuery($query);
     }
-    $row = $dsql->GetOne("SELECT * FROM `#@__softconfig` ");
+    $row = $dsql->GetOne("SELECT * FROM `#@__softconfig`");
     $sites = explode("\n", $row['sites']);
     $allowed = array();
     foreach ($sites as $site) {
@@ -95,7 +95,7 @@ else if ($open == 2) {
         ShowMsg('找不到所需要的软件资源', 'javascript:;');
         exit();
     }
-    $softconfig = $dsql->GetOne("SELECT * FROM `#@__softconfig` ");
+    $softconfig = $dsql->GetOne("SELECT * FROM `#@__softconfig`");
     $needRank = $softconfig['dfrank'];
     $needMoney = $softconfig['dfywboy'];
     if ($softconfig['argrange'] == 0) {
@@ -166,7 +166,7 @@ else if ($open == 2) {
         $pubdate = GetDateTimeMk($pubdate);
         //会员级别不足
         if (($needRank > 1 && $cfg_ml->M_Rank < $needRank && $mid != $cfg_ml->M_ID)) {
-            $dsql->Execute('me', "SELECT * FROM `#@__arcrank` ");
+            $dsql->Execute('me', "SELECT * FROM `#@__arcrank`");
             while ($row = $dsql->GetObject('me')) {
                 $memberTypes[$row->rank] = $row->membername;
             }

src/apps/list.php

@@ -40,7 +40,7 @@ if ($tinfos['issystem'] == -1) {
         require_once(DEDEINC.'/memberlogin.class.php');
         $cfg_ml = new MemberLogin();
         if ($cfg_ml->M_Rank < $lv->Fields['corank']) {
-            $dsql->Execute('me', "SELECT * FROM `#@__arcrank` ");
+            $dsql->Execute('me', "SELECT * FROM `#@__arcrank`");
             while ($row = $dsql->GetObject('me')) {
                 $memberTypes[$row->rank] = $row->membername;
             }

src/apps/view.php

@@ -37,7 +37,7 @@ if ($needMoney > 0 || $needRank > 1) {
     $pubdate = GetDateTimeMk($arc->Fields["pubdate"]);
     //会员级别不足
     if (($needRank > 1 && $cfg_ml->M_Rank < $needRank && $arc->Fields['mid'] != $cfg_ml->M_ID)) {
-        $dsql->Execute('me', "SELECT * FROM `#@__arcrank` ");
+        $dsql->Execute('me', "SELECT * FROM `#@__arcrank`");
         while ($row = $dsql->GetObject('me')) {
             $memberTypes[$row->rank] = $row->membername;
         }

src/static/web/css/admin.css

@@ -500,8 +500,8 @@ span.page-link {
 	background:#1eb867
 }
 .maintable {
-	width:98%;
-	border:1px solid #dee2e6
+	width:98%!important;
+	border:1px solid #dee2e6!important
 }
 .form-control {
 	display:inline-block;

src/system/common.func.php

@@ -1,5 +1,14 @@
 <?php
 if (!defined('DEDEINC')) exit('dedebiz');
+/**
+ * 系统核心函数存放文件
+ * 
+ * @version        $id:common.func.php 4 16:39 2010年7月6日 tianya $
+ * @package        DedeBIZ.Libraries
+ * @copyright      Copyright (c) 2022 DedeBIZ.COM
+ * @license        https://www.dedebiz.com/license
+ * @link           https://www.dedebiz.com
+ */
 //显示类似Bootstrap系统提示
 define('ALERT_PRIMARY', 1);
 define('ALERT_SECONDARY', 2);
@@ -28,15 +37,6 @@ function DedeAlert($content, $type = ALERT_PRIMARY)
     list($background, $border, $color) = $colors;
     return str_replace(array('~color~','~background~','~border~', '~content~'),array($color,$background,$border,$content),ALERT_TPL);
 }
-/**
- * 系统核心函数存放文件
- * 
- * @version        $id:common.func.php 4 16:39 2010年7月6日 tianya $
- * @package        DedeBIZ.Libraries
- * @copyright      Copyright (c) 2022 DedeBIZ.COM
- * @license        https://www.dedebiz.com/license
- * @link           https://www.dedebiz.com
- */
 if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
     if (!function_exists('mysql_connect') and function_exists('mysqli_connect')) {
         function mysql_connect($server, $username, $password)

src/system/common.inc.php

@@ -10,7 +10,7 @@
 define('DEDEBIZ_SAFE_MODE', FALSE);
 //生产环境使用`production`，如果采用`dev`模式，会有一些php的报错信息提示，用于开发调试
 if (!defined('DEDE_ENVIRONMENT')) {
-    define('DEDE_ENVIRONMENT', 'dev');
+    define('DEDE_ENVIRONMENT', 'production');
 }
 if (!defined('DEBUG_LEVEL')) {
     if (DEDE_ENVIRONMENT == 'production') {
@@ -133,8 +133,7 @@ if (!isset($cfg_dbtype)) {
 if (!empty($cfg_domain_cookie)) {
     @session_set_cookie_params(0, '/', $cfg_domain_cookie);
 }
-//php5.1版本以上时区设置
-//由于这个函数对于是php5.1以下版本并无意义，因此实际上的时间调用，应该用MyDate函数调用
+//php5.1版本以上时区设置，由于这个函数对于是php5.1以下版本并无意义，因此实际上的时间调用，应该用MyDate函数调用
 if (PHP_VERSION > '5.1') {
     $time51 = $cfg_cli_time * -1;
     @date_default_timezone_set('Etc/GMT'.$time51);
@@ -187,7 +186,7 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft';
 $cfg_other_medias = $cfg_medias_dir.'/media';
 //软件摘要信息，请不要删除，否则系统无法正确接收系统漏洞或升级信息
 $cfg_version = 'V6';
-$cfg_version_detail = '6.2.3'; //详细版本号
+$cfg_version_detail = '6.2.3';//详细版本号
 $cfg_soft_lang = 'utf-8';
 $cfg_soft_public = 'base';
 $cfg_softname = '得德系统';

src/system/taglib/channel/softlinks.lib.php

@@ -22,7 +22,7 @@ if (!defined('DEDEINC')) exit('dedebiz');
 function ch_softlinks($fvalue, &$ctag, &$refObj, $fname = '', $downloadpage = false)
 {
     global $dsql;
-    $row = $dsql->GetOne("SELECT * FROM `#@__softconfig` ");
+    $row = $dsql->GetOne("SELECT * FROM `#@__softconfig`");
     $phppath = $GLOBALS['cfg_phpurl'];
     $downlinks = '';
     if ($row['downtype'] != '0' && !$downloadpage) {

src/system/taglib/softmsg.lib.php

@@ -16,7 +16,7 @@ function lib_softmsg(&$ctag, &$refObj)
     //FillAttsDefault($ctag->CAttribute->Items,$attlist);
     //extract($ctag->CAttribute->Items, EXTR_SKIP);
     $revalue = '';
-    $row = $dsql->GetOne(" SELECT * FROM `#@__softconfig` ");
+    $row = $dsql->GetOne(" SELECT * FROM `#@__softconfig`");
     if (is_array($row)) $revalue = $row['downmsg'];
     return $revalue;
 }

src/user/buy.php

@@ -25,7 +25,7 @@ while ($row = $dsql->GetObject('mct')) {
     </tr>
     ";
 }
-$dsql->SetQuery("SELECT `#@__member_type`.*,`#@__arcrank`.membername,`#@__arcrank`.`money` as cm From `#@__member_type` LEFT JOIN `#@__arcrank` on `#@__arcrank`.`rank` = `#@__member_type`.`rank` ");
+$dsql->SetQuery("SELECT `#@__member_type`.*,`#@__arcrank`.membername,`#@__arcrank`.`money` as cm From `#@__member_type` LEFT JOIN `#@__arcrank` on `#@__arcrank`.`rank` = `#@__member_type`.`rank`");
 $dsql->Execute('mt');
 while ($row = $dsql->GetObject('mt')) {
     $row->money = sprintf("%01.2f", $row->money);

src/user/inc/inc_catalog_options.php

@@ -19,7 +19,7 @@ if (!defined('DEDEINC')) exit('dedebiz');
 function GetOptionList($selid = 0, $channeltype = 0)
 {
     global $OptionArrayList, $channels, $dsql;
-    $dsql->SetQuery("SELECT id,typename FROM `#@__channeltype` ");
+    $dsql->SetQuery("SELECT id,typename FROM `#@__channeltype`");
     $dsql->Execute('opt');
     $channels = array();
     while ($row = $dsql->GetObject('opt')) {