优化

src/admin/makehtml_list_action.php

@@ -12,7 +12,6 @@ require_once(dirname(__FILE__)."/config.php");
 CheckPurview('sys_MakeHtml');
 require_once(DEDEDATA."/cache/inc_catalog_base.inc");
 require_once(DEDEINC."/channelunit.func.php");
-
 if (!isset($upnext)) $upnext = 1;
 if (empty($gotype)) $gotype = '';
 if (empty($pageno)) $pageno = 0;
@@ -21,7 +20,6 @@ if (empty($typeid)) $typeid = 0;
 if (!isset($uppage)) $uppage = 0;
 if (empty($maxpagesize)) $maxpagesize = 50;
 $adminID = $cuserLogin->getUserID();
-
 //检测获取所有栏目ID
 //普通生成或一键更新时更新所有栏目
 if ($gotype == '' || $gotype == 'mkallct') {
@@ -44,7 +42,6 @@ else if ($gotype == 'mkall') {
     $idArray = array();
     if (file_exists($mkcachefile)) require_once($mkcachefile);
 }
-
 //当前更新栏目的ID
 $totalpage = count($idArray);
 if (isset($idArray[$pageno])) {
@@ -58,14 +55,11 @@ if (isset($idArray[$pageno])) {
         exit();
     }
 }
-
 if ($pageno == 0 && $mkpage == 1) //清空缓存
 {
     $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache` ");
 }
-
 $reurl = '';
-
 //更新数组所记录的栏目
 if (!empty($tid)) {
     if (!isset($cfg_Cs[$tid])) {
@@ -95,7 +89,6 @@ if (!empty($tid)) {
         if ($mkpage >= ($ntotalpage + 1)) $finishType = TRUE;
     }
 }
-
 $nextpage = $pageno + 1;
 if ($nextpage >= $totalpage && $finishType) {
     if ($gotype == '') {
@@ -118,4 +111,4 @@ if ($nextpage >= $totalpage && $finishType) {
         ShowMsg("栏目：".$tid."，继续进行操作", $gourl, 0, 100);
         exit();
     }
-}
+}

src/admin/sys_info.php

@@ -11,9 +11,7 @@
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('sys_Edit');
 if (empty($dopost)) $dopost = "";
-
 $configfile = DEDEDATA.'/config.cache.inc.php';
-
 //更新配置函数
 function ReWriteConfig()
 {
@@ -39,7 +37,6 @@ function ReWriteConfig()
     fwrite($fp, "?".">");
     fclose($fp);
 }
-
 //保存配置的改动
 if ($dopost == "save") {
     CheckCSRF();
@@ -162,4 +159,4 @@ EOT;
     echo $hash;
     exit();
 }
-include DedeInclude('templets/sys_info.htm');
+include DedeInclude('templets/sys_info.htm');

src/admin/tag_test_action.php

@@ -17,17 +17,14 @@ if (empty($partcode)) {
     exit;
 }
 $partcode = stripslashes($partcode);
-
 if (empty($typeid)) $typeid = 0;
 if (empty($showsource)) $showsource = "";
-
 if ($typeid > 0) $pv = new PartView($typeid);
 else $pv = new PartView();
-
 $pv->SetTemplet($partcode, "string");
 if ($showsource == "" || $showsource == "yes") {
     echo "模板代码:";
     echo "<span style='color:#dc3545;'><pre>".dede_htmlspecialchars($partcode)."</pre></span>";
     echo "结果:<hr size='1' width='100%'>";
 }
-$pv->Display();
+$pv->Display();

src/admin/templets/content_i_list.htm

@@ -38,9 +38,9 @@ img{margin-right:0}
 	</table>
 	<form name="form3" action="content_i_list.php" method="get">
 		<input type="hidden" name="dopost" value="listArchives">
-		<table width="98%" cellpadding="1" cellspacing="1" align="center" class="mb-3" style="margin-top:10px;border:1px solid #dee2e6">
+		<table width="98%" cellpadding="1" cellspacing="1" align="center" class="mt-3 mb-3" style="border:1px solid #dee2e6">
 			<tr>
-				<td style="height:36px;background:#f8f8f8">
+				<td height="36" bgcolor="#f8f8f8">
 					<table border="0" cellpadding="0" cellspacing="0">
 						<tr>
 							<td>

src/admin/templets/content_list.htm

@@ -34,9 +34,9 @@
 	</table>
 	<form name="form3" action="content_list.php" method="get">
 		<input type="hidden" name="dopost" value="listArchives">
-		<table width="98%" cellpadding="1" cellspacing="1" align="center" class="mb-3" style="margin-top:10px;border:1px solid #dee2e6">
+		<table width="98%" cellpadding="1" cellspacing="1" align="center" class="mt-3 mb-3" style="border:1px solid #dee2e6">
 			<tr>
-				<td style="height:36px;background:#f8f8f8">
+				<td height="36" bgcolor="#f8f8f8">
 					<table border="0" cellpadding="0" cellspacing="0">
 						<tr>
 							<td>

src/admin/templets/content_s_list.htm

@@ -117,9 +117,9 @@ function noSelAll() {
 	</table>
 	<form name="form3" action="content_s_list.php" method="get">
 		<input type="hidden" name="dopost" value="listArchives">
-		<table width="98%" cellpadding="1" cellspacing="1" align="center" class="mb-3" style="margin-top:10px;border:1px solid #dee2e6">
+		<table width="98%" cellpadding="1" cellspacing="1" align="center" class="mt-3 mb-3" style="border:1px solid #dee2e6">
 			<tr>
-				<td style="height:36px;background:#f8f8f8">
+				<td height="36" bgcolor="#f8f8f8">
 					<table border="0" cellpadding="0" cellspacing="0">
 						<tr>
 							<td>

src/admin/templets/content_sg_list.htm

@@ -161,9 +161,9 @@
 	</table>
 	<form name='form3' action='content_sg_list.php' method='get'>
 		<input type='hidden' name='dopost' value='listArchives'>
-		<table width="98%" cellpadding="1" cellspacing="1" align="center" class="mb-3" style="margin-top:10px;border:1px solid #dee2e6">
+		<table width="98%" cellpadding="1" cellspacing="1" align="center" class="mt-3 mb-3" style="border:1px solid #dee2e6">
 			<tr>
-				<td style="height:36px;background:#f8f8f8">
+				<td height="36" bgcolor="#f8f8f8">
 					<table border="0" cellpadding="0" cellspacing="0">
 						<tr>
 							<td>

src/admin/templets/freelist_add.htm

@@ -116,8 +116,7 @@
                     <tr>
                       <td height="30" align="left">列表模板：</td>
                       <td align="left"><input name="templet" type="text" id="templet" style="width:300px" value="{style}/list_free.htm">
-                        <button type="button" name="set4" style="width:60px"
-                          onClick="SelectTemplets('form1.templet');" class="btn btn-success btn-sm">浏览</button></td>
+                        <button type="button" name="set4" style="width:60px" onClick="SelectTemplets('form1.templet');" class="btn btn-success btn-sm">浏览</button></td>
                     </tr>
                     <tr>
                       <td height="30" align="left">最大列出页数：</td>

src/admin/templets/member_main.htm

@@ -14,9 +14,9 @@
 </head>
 <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'>
   <form action="member_main.php" name="form1" method="get">
-  <table width="98%" border="0" cellspacing="1" align="center" class="table maintable mt-3" style="margin-bottom:10px">
+  <table width="98%" border="0" cellspacing="1" align="center" class="table maintable mt-3 mb-3">
     <tr>
-      <td style="height:36px;background:#f8f8f8">
+      <td height="36" bgcolor="#f8f8f8">
         <table border="0" cellpadding="0" cellspacing="0">
           <tr>
             <td>关键词：</td>

src/admin/templets/member_operations.htm

@@ -58,9 +58,9 @@
 </head>
 <body background="../static/web/img/allbg.gif" leftmargin='8' topmargin='8'>
   <form name="form2" method="get" action="member_operations.php">
-    <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable mt-3" style="margin-bottom:10px">
+    <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable mt-3 mb-3">
       <tr>
-        <td style="height:36px;background:#f8f8f8">
+        <td height="36" bgcolor="#f8f8f8">
           <table border="0" cellpadding="0" cellspacing="0">
             <tr>
               <td>输入订单号：</td>

src/admin/templets/member_pm.htm

@@ -19,7 +19,7 @@
   <form action="member_pm.php" name="form1" method="get">
     <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable table-borderless" style="margin-bottom:10px">
       <tr>
-        <td style="height:36px;background:#f8f8f8">
+        <td height="36" bgcolor="#f8f8f8">
           <table border="0" cellpadding="0" cellspacing="0">
             <tr>
               <td>关键词：</td>

src/admin/templets/member_pmall.htm

@@ -18,7 +18,7 @@
 <form action="member_pm.php" name="form1" method="get">
   <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable table-borderless" style="margin-bottom:10px">
     <tr>
-      <td style="height:36px;background:#f8f8f8">
+      <td height="36" bgcolor="#f8f8f8">
         <table border="0" cellpadding="0" cellspacing="0">
           <tr>
             <td>关键词：</td>

src/admin/templets/member_pmone.htm

@@ -18,7 +18,7 @@
 <form action="member_pm.php" name="form1" method="get">
   <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable table-borderless" style="margin-bottom:10px">
     <tr>
-      <td style="height:36px;background:#f8f8f8">
+      <td height="36" bgcolor="#f8f8f8">
         <table border="0" cellpadding="0" cellspacing="0">
           <tr>
             <td>关键词：</td>

src/admin/templets/module_make.htm

@@ -43,7 +43,7 @@
       <input type='hidden' name='action' value='make'>
       <tr>
         <td height="26" colspan="2" bgcolor="#EDF9D5" background="../static/web/img/tbg.gif" style="padding-left:10px"><a href="module_main.php">模块管理</a>
-          &gt;  模块打包：</td>
+          &gt; 模块打包：</td>
       </tr>
       <tr>
         <td width="19%" align="center" bgcolor="#FFFFFF">模块名称：</td>

src/admin/templets/mychannel_field_edit.htm

@@ -91,7 +91,7 @@
           <table width="98%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
             <tr>
               <td width="30%" style="padding-left:10px">
-                <a href="mychannel_main.php">频道管理</a>  &gt;  查看/修改字段：
+                <a href="mychannel_main.php">频道管理</a>  &gt; 查看/修改字段：
               </td>
               <td align="right" style="padding-top:6px;">
                 <button type="button" name="ss1" class="btn btn-success btn-sm" onClick="location='mychannel_edit.php?id=<?php echo $id?>&dopost=edit';">当前模型信息</button>

src/admin/templets/shops_operations.htm

@@ -69,9 +69,9 @@
 </head>
 <body background='../static/web/img/allbg.gif' leftmargin='8' topmargin='8'>
   <form name="form2" method="get" action="shops_operations.php">
-    <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable mt-3" style="margin-bottom:10px">
+    <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable mt-3 mb-3">
       <tr>
-        <td style="height:36px;background:#f8f8f8">
+        <td height="36" bgcolor="#f8f8f8">
           <table border="0" cellpadding="0" cellspacing="0">
             <tr>
               <td>输入订单号：</td>

src/admin/templets/sys_sql_query.htm

@@ -53,30 +53,24 @@ while($row = $dsql->GetArray('t',MYSQL_BOTH))
 	$dsql->Execute('n');
 	$row2 = $dsql->GetArray('n',MYSQL_BOTH);
 	$dd = $row2[0];
-	echo " 		<option value='".$row[0]."'>".$row[0]."(".$dd.")</option>\r\n";
+	echo "<option value='".$row[0]."'>".$row[0]."(".$dd.")</option>\r\n";
 }
 ?>
                       </select>
                     </td>
                     <td width="2%"></td>
                     <td width="63%" valign="bottom">
-
                       <div style="float:left;margin-right:20px;">
-                        <button type="Submit" name="Submit1" class="btn btn-success btn-sm"
-                          onClick="this.form.dopost.value='opimize';">优化选中表</button>
+                        <button type="Submit" name="Submit1" class="btn btn-success btn-sm" onClick="this.form.dopost.value='opimize';">优化选中表</button>
                         <br>
-                        <button type="Submit" name="Submit2" class="btn btn-success btn-sm"
-                          onClick="this.form.dopost.value='repair';" style="margin-top:6px;">修复选中表</button>
+                        <button type="Submit" name="Submit2" class="btn btn-success btn-sm" onClick="this.form.dopost.value='repair';" style="margin-top:6px;">修复选中表</button>
                         <br>
-                        <button type="Submit" name="Submit3" class="btn btn-success btn-sm"
-                          onClick="this.form.dopost.value='viewinfo';" style="margin-top:6px;">查看表结构</button>
+                        <button type="Submit" name="Submit3" class="btn btn-success btn-sm" onClick="this.form.dopost.value='viewinfo';" style="margin-top:6px;">查看表结构</button>
                       </div>
                       <div style="float:left">
-                        <button type="Submit" name="Submit5" class="btn btn-success btn-sm"
-                          onClick="this.form.dopost.value='opimizeAll';">优化全部表</button>
+                        <button type="Submit" name="Submit5" class="btn btn-success btn-sm" onClick="this.form.dopost.value='opimizeAll';">优化全部表</button>
                         <br>
-                        <button type="Submit" name="Submit6" class="btn btn-success btn-sm"
-                          onClick="this.form.dopost.value='repairAll';" style="margin-top:6px;">修复全部表</button>
+                        <button type="Submit" name="Submit6" class="btn btn-success btn-sm" onClick="this.form.dopost.value='repairAll';" style="margin-top:6px;">修复全部表</button>
                       </div>
 
                     </td>

src/admin/templets/templets_one.htm

@@ -13,7 +13,6 @@
          padding: 0px;
          margin: 0px;
       }
-
       li {
          float: left;
          padding-right: 8px;

src/install/index.php

@@ -9,12 +9,10 @@
 @set_time_limit(0);
 error_reporting(E_ALL || ~E_NOTICE);
 define('INSLOCKFILE', dirname(__FILE__).'/install_lock.txt');
-
 if(file_exists(INSLOCKFILE))
 {
     exit("程序已运行安装，如果您确定要重新安装，请先删除 public/install/install_lock.txt");
 }
-
 $verMsg = 'V6';
 $dfDbname = 'DedeBIZ';
 $cfg_version_detail = '6.1.7beta'; //详细版本号
@@ -22,7 +20,6 @@ $errmsg = '';
 if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
     mysqli_report(MYSQLI_REPORT_OFF);
 }
-
 $moduleCacheFile = dirname(__FILE__).'/modules.tmp.inc';
 define('DEDEINC',dirname(__FILE__).'/../system');
 define('DEDEDATA',dirname(__FILE__).'/../data');
@@ -35,7 +32,6 @@ foreach(Array('_GET','_POST','_COOKIE') as $_request)
     foreach($$_request as $_k => $_v) ${$_k} = RunMagicQuotes($_v);
 }
 require_once(DEDEINC.'/common.func.php');
-
 if(empty($step))
 {
     $step = 1;

src/system/common.inc.php

@@ -7,15 +7,12 @@
  * @link           https://www.dedebiz.com
  */
 //生产环境使用production，如果采用dev模式，会有一些php的报错信息提示，便于开发调试
-
 if (!defined('DEDE_ENVIRONMENT')) {
     define('DEDE_ENVIRONMENT', 'production');
 }
-
 if (!defined('DEBUG_LEVEL')) {
     define('DEBUG_LEVEL', FALSE);//如果设置为TRUE则会打印执行SQL的时间和标签加载时间方便调试
 }
-
 if (DEDE_ENVIRONMENT == 'production') {
     ini_set('display_errors', 0);
     if (version_compare(PHP_VERSION, '5.3', '>='))
@@ -30,7 +27,6 @@ if (DEDE_ENVIRONMENT == 'production') {
     error_reporting(-1);
     ini_set('display_errors', 1);
 }
-
 define('DEDEINC', str_replace("\\", '/', dirname(__FILE__)));
 define('DEDEROOT', str_replace("\\", '/', substr(DEDEINC, 0, -6))); // 站点根目录
 define('DEDEDATA', substr(DEDEINC, 0, -6).'data');
@@ -88,7 +84,6 @@ function _RunMagicQuotes(&$svar)
     }
     return $svar;
 }
-
 foreach (array('_GET', '_POST', '_COOKIE') as $_req) {
     foreach ($$_req as $_k => $_v) {
         if ($_k == 'nvarname') ${$_k} = $_v;
@@ -229,7 +224,6 @@ if (isset($GLOBALS['PageNo'])) {
 if (isset($GLOBALS['TotalResult'])) {
     $GLOBALS['TotalResult'] = intval($GLOBALS['TotalResult']);
 }
-
 if (!isset($cfg_NotPrintHead)) {
     if (PHP_SAPI != 'cli') {
         header("Content-Type: text/html; charset={$cfg_soft_lang}");

src/user/templets/soft_add.htm

@@ -212,8 +212,7 @@
                       <div class="col-sm-10">
                         <input name="vdcode" type="text" id="vdcode" maxlength="100" class="intxt"
                           style='width:100px;text-transform:uppercase;' />
-                        <img src="../apps/vdimgck.php" alt="看不清点击更换" align="absmiddle" style="cursor:pointer"
-                          onclick="this.src=this.src+'?'" />
+                        <img src="../apps/vdimgck.php" alt="看不清点击更换" align="absmiddle" style="cursor:pointer" onClick="this.src=this.src+'?'" />
                       </div>
                     </div>
                     <?php }?>

src/user/templets/soft_edit.htm

@@ -223,8 +223,7 @@
                       <div class="col-sm-10">
                         <input name="vdcode" type="text" id="vdcode" maxlength="100" class="intxt"
                           style='width:100px;text-transform:uppercase;' />
-                        <img src="../apps/vdimgck.php" alt="看不清点击更换" align="absmiddle" style="cursor:pointer"
-                          onclick="this.src=this.src+'?'" />
+                        <img src="../apps/vdimgck.php" alt="看不清点击更换" align="absmiddle" style="cursor:pointer" onClick="this.src=this.src+'?'" />
                       </div>
                     </div>
                     <?php }?>