From 388e138c623b1f09c7244e6f63763ff5392afbbf Mon Sep 17 00:00:00 2001 From: xushubieli Date: Fri, 1 Apr 2022 18:28:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/makehtml_list_action.php | 9 +-------- src/admin/sys_info.php | 5 +---- src/admin/tag_test_action.php | 5 +---- src/admin/templets/content_i_list.htm | 4 ++-- src/admin/templets/content_list.htm | 4 ++-- src/admin/templets/content_s_list.htm | 4 ++-- src/admin/templets/content_sg_list.htm | 4 ++-- src/admin/templets/freelist_add.htm | 3 +-- src/admin/templets/member_main.htm | 4 ++-- src/admin/templets/member_operations.htm | 4 ++-- src/admin/templets/member_pm.htm | 2 +- src/admin/templets/member_pmall.htm | 2 +- src/admin/templets/member_pmone.htm | 2 +- src/admin/templets/module_make.htm | 2 +- src/admin/templets/mychannel_field_edit.htm | 2 +- src/admin/templets/shops_operations.htm | 4 ++-- src/admin/templets/sys_sql_query.htm | 18 ++++++------------ src/admin/templets/templets_one.htm | 1 - src/install/index.php | 4 ---- src/system/common.inc.php | 6 ------ src/user/templets/soft_add.htm | 3 +-- src/user/templets/soft_edit.htm | 3 +-- 22 files changed, 31 insertions(+), 64 deletions(-) diff --git a/src/admin/makehtml_list_action.php b/src/admin/makehtml_list_action.php index 906b2df3..142eec8e 100644 --- a/src/admin/makehtml_list_action.php +++ b/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(); } -} +} \ No newline at end of file diff --git a/src/admin/sys_info.php b/src/admin/sys_info.php index 002477d9..99d14b06 100644 --- a/src/admin/sys_info.php +++ b/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'); \ No newline at end of file diff --git a/src/admin/tag_test_action.php b/src/admin/tag_test_action.php index e8a8fcca..fe40228f 100644 --- a/src/admin/tag_test_action.php +++ b/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 "
".dede_htmlspecialchars($partcode)."
"; echo "结果:
"; } -$pv->Display(); +$pv->Display(); \ No newline at end of file diff --git a/src/admin/templets/content_i_list.htm b/src/admin/templets/content_i_list.htm index 1a2750ef..aed9c4b4 100644 --- a/src/admin/templets/content_i_list.htm +++ b/src/admin/templets/content_i_list.htm @@ -38,9 +38,9 @@ img{margin-right:0}
- +
-
+
diff --git a/src/admin/templets/content_list.htm b/src/admin/templets/content_list.htm index 1d4d5b90..2ea3c003 100644 --- a/src/admin/templets/content_list.htm +++ b/src/admin/templets/content_list.htm @@ -34,9 +34,9 @@
- +
-
+
diff --git a/src/admin/templets/content_s_list.htm b/src/admin/templets/content_s_list.htm index a955a0fb..fd34e6d4 100644 --- a/src/admin/templets/content_s_list.htm +++ b/src/admin/templets/content_s_list.htm @@ -117,9 +117,9 @@ function noSelAll() {
- +
-
+
diff --git a/src/admin/templets/content_sg_list.htm b/src/admin/templets/content_sg_list.htm index 3e008792..cfdc0cf8 100644 --- a/src/admin/templets/content_sg_list.htm +++ b/src/admin/templets/content_sg_list.htm @@ -161,9 +161,9 @@
- +
-
+ + diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm index f3d0c901..aa91fd7d 100644 --- a/src/admin/templets/member_main.htm +++ b/src/admin/templets/member_main.htm @@ -14,9 +14,9 @@ -
diff --git a/src/admin/templets/freelist_add.htm b/src/admin/templets/freelist_add.htm index cfffcd46..8263b5e8 100644 --- a/src/admin/templets/freelist_add.htm +++ b/src/admin/templets/freelist_add.htm @@ -116,8 +116,7 @@
列表模板： -
最大列出页数：
+
-
+ diff --git a/src/admin/templets/member_operations.htm b/src/admin/templets/member_operations.htm index 5b403256..70d608a0 100644 --- a/src/admin/templets/member_operations.htm +++ b/src/admin/templets/member_operations.htm @@ -58,9 +58,9 @@ -
关键词：
+
-
+ diff --git a/src/admin/templets/member_pm.htm b/src/admin/templets/member_pm.htm index 4279793c..b4025140 100644 --- a/src/admin/templets/member_pm.htm +++ b/src/admin/templets/member_pm.htm @@ -19,7 +19,7 @@
输入订单号：
-
+ diff --git a/src/admin/templets/member_pmall.htm b/src/admin/templets/member_pmall.htm index d7ca1d9c..90c71c94 100644 --- a/src/admin/templets/member_pmall.htm +++ b/src/admin/templets/member_pmall.htm @@ -18,7 +18,7 @@
关键词：
-
+ diff --git a/src/admin/templets/member_pmone.htm b/src/admin/templets/member_pmone.htm index b0b26108..d6d2c901 100644 --- a/src/admin/templets/member_pmone.htm +++ b/src/admin/templets/member_pmone.htm @@ -18,7 +18,7 @@
关键词：
-
+ diff --git a/src/admin/templets/module_make.htm b/src/admin/templets/module_make.htm index e25c9993..28cb2a93 100644 --- a/src/admin/templets/module_make.htm +++ b/src/admin/templets/module_make.htm @@ -43,7 +43,7 @@ + > 模块打包： diff --git a/src/admin/templets/mychannel_field_edit.htm b/src/admin/templets/mychannel_field_edit.htm index 491b66f1..a54846e9 100644 --- a/src/admin/templets/mychannel_field_edit.htm +++ b/src/admin/templets/mychannel_field_edit.htm @@ -91,7 +91,7 @@
关键词：
模块管理 - > 模块打包：
模块名称：
- 频道管理 > 查看/修改字段： + 频道管理 > 查看/修改字段： diff --git a/src/admin/templets/shops_operations.htm b/src/admin/templets/shops_operations.htm index f91ecc01..4913b802 100644 --- a/src/admin/templets/shops_operations.htm +++ b/src/admin/templets/shops_operations.htm @@ -69,9 +69,9 @@ - +
-
+ diff --git a/src/admin/templets/sys_sql_query.htm b/src/admin/templets/sys_sql_query.htm index c3537f36..3fb5b997 100644 --- a/src/admin/templets/sys_sql_query.htm +++ b/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 " \r\n"; + echo "\r\n"; } ?> diff --git a/src/admin/templets/templets_one.htm b/src/admin/templets/templets_one.htm index 69977521..066346eb 100644 --- a/src/admin/templets/templets_one.htm +++ b/src/admin/templets/templets_one.htm @@ -13,7 +13,6 @@ padding: 0px; margin: 0px; } - li { float: left; padding-right: 8px; diff --git a/src/install/index.php b/src/install/index.php index e83ae238..696a3dc1 100644 --- a/src/install/index.php +++ b/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; diff --git a/src/system/common.inc.php b/src/system/common.inc.php index 5e486902..2ce7ed2a 100755 --- a/src/system/common.inc.php +++ b/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}"); diff --git a/src/user/templets/soft_add.htm b/src/user/templets/soft_add.htm index fc00df78..d675255d 100755 --- a/src/user/templets/soft_add.htm +++ b/src/user/templets/soft_add.htm @@ -212,8 +212,7 @@
- 看不清点击更换 + 看不清点击更换
diff --git a/src/user/templets/soft_edit.htm b/src/user/templets/soft_edit.htm index 76cfbab0..3cfdf409 100755 --- a/src/user/templets/soft_edit.htm +++ b/src/user/templets/soft_edit.htm @@ -223,8 +223,7 @@
- 看不清点击更换 + 看不清点击更换
输入订单号： -
- +
- +
- +
- +
- +