From e67217620c455bac06c8c40f98f9a0075125150b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Thu, 29 Jun 2023 10:32:53 +0800 Subject: [PATCH] ok --- src/admin/album_add.php | 2 +- src/admin/album_edit.php | 2 +- src/admin/archives_do.php | 2 +- src/admin/article_description_main.php | 4 ++-- src/admin/content_list.php | 2 +- src/admin/content_sg_list.php | 2 +- src/admin/friendlink_add.php | 2 +- src/admin/inc/inc_archives_functions.php | 8 ++++---- src/admin/index_testenv.php | 8 ++++---- src/admin/makehtml_homepage.php | 1 - src/admin/makehtml_list_action.php | 2 +- src/admin/templets/content_i_list.htm | 2 +- src/admin/templets/content_list.htm | 2 +- src/admin/templets/content_sg_list.htm | 2 +- src/admin/templets/index_body.htm | 14 +++++++------- src/apps/download.php | 2 +- src/apps/list.php | 2 +- src/install/index.php | 8 +++----- src/system/helpers/upload.helper.php | 2 +- src/system/typelink/typeunit.class.admin.php | 2 +- src/user/inc/inc_archives_functions.php | 2 +- src/user/inc/inc_pwd_functions.php | 2 +- 22 files changed, 36 insertions(+), 39 deletions(-) diff --git a/src/admin/album_add.php b/src/admin/album_add.php index d8db5e64..a26dc5ee 100644 --- a/src/admin/album_add.php +++ b/src/admin/album_add.php @@ -121,7 +121,7 @@ if ($dopost != 'save') { $ntime = time(); $savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999)); + $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000,9999)); $fullUrl = $fullUrl.$ext; file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1])); $info = ''; diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index dd7c1394..82390c09 100644 --- a/src/admin/album_edit.php +++ b/src/admin/album_edit.php @@ -195,7 +195,7 @@ if ($dopost != 'save') { $ntime = time(); $savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999)); + $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000,9999)); $fullUrl = $fullUrl.$ext; file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1])); $info = ''; diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php index 6e75905e..4167f011 100644 --- a/src/admin/archives_do.php +++ b/src/admin/archives_do.php @@ -33,7 +33,7 @@ if ($dopost == 'editArchives') { $ntime = time(); $savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999)); + $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000,9999)); $fullUrl = $fullUrl.".png"; file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1])); //加水印 diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php index 2a1342a8..97f7b839 100644 --- a/src/admin/article_description_main.php +++ b/src/admin/article_description_main.php @@ -79,7 +79,7 @@ if ($dojob == '') { exit(); } $dvlen = $tjlen * 1; - $tjsta = "
"; + $tjsta = "
$dvlen%
"; $tjsta .= "完成更新文档总数$tjlen%"; $nurl = "article_description_main.php?totalnum=$totalnum&startdd={$startdd}&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}"; ShowMsg($tjsta, $nurl, 0, 500); @@ -139,7 +139,7 @@ if ($dojob == '') { $tjlen = 100; } $dvlen = $tjlen * 1; - $tjsta = "
"; + $tjsta = "
$dvlen%
"; $tjsta .= "完成更新文档总数$tjlen%"; if ($tjnum < $totalnum) { $nurl = "article_description_main.php?totalnum=$totalnum&startdd=".($startdd + $pagesize)."&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}"; diff --git a/src/admin/content_list.php b/src/admin/content_list.php index 52d44b92..0e4c1005 100644 --- a/src/admin/content_list.php +++ b/src/admin/content_list.php @@ -1,6 +1,6 @@ SaveToBin($rndtrueName); @@ -359,7 +359,7 @@ function GetDDImage($litpic, $picname, $isremote) } $savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999)); + $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000,9999)); if (strtolower($_FILES[$litpic]['type']) == "image/gif") { $fullUrl = $fullUrl.".gif"; } else if (strtolower($_FILES[$litpic]['type']) == "image/png") { @@ -681,7 +681,7 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '') } else { $savepath = $cfg_image_dir.'/'.date("%Y-%m", $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.date("%d", $ntime).dd2char(date("%H%M%S", $ntime).'0'.$cuserLogin->getUserID().'0'.mt_rand(1000, 9999)); + $fullUrl = $savepath.'/'.date("%d", $ntime).dd2char(date("%H%M%S", $ntime).'0'.$cuserLogin->getUserID().'0'.mt_rand(1000,9999)); } if (strtolower($_FILES[$upname]['type']) == "image/gif") { $fullUrl = $fullUrl.".gif"; diff --git a/src/admin/index_testenv.php b/src/admin/index_testenv.php index fc2afeac..d2071584 100644 --- a/src/admin/index_testenv.php +++ b/src/admin/index_testenv.php @@ -123,7 +123,7 @@ if (!function_exists('IsWritable')) { $safeMsg = array(); $dirname = str_replace('index_body.php', '', strtolower($_SERVER['PHP_SELF'])); if (!DEDEBIZ_SAFE_MODE) { - $safeMsg[] = '系统运行环境为开发模式，建议您启用安全模式 详情'; + $safeMsg[] = '系统运行环境为开发模式，建议您启用安全模式详情'; } if (!IsSSL()) { $safeMsg[] = '检测到网址非安全链接，建议您部署https'; @@ -139,13 +139,13 @@ if (preg_match("#[\\|/]admin[\\|/]#", $dirname)) { } $rs = TestAdminPWD(); if ($rs < 0) { - $linkurl = '修改'; + $linkurl = '修改'; switch ($rs) { case -1: - $msg = "检测到管理员默认名称没有修改，建议您修改 {$linkurl}"; + $msg = "检测到默认账号没有修改，建议您修改{$linkurl}"; break; case -2: - $msg = "检测到管理员默认名称和密码没有修改，建议您修改 {$linkurl}"; + $msg = "检测到默认账号和密码没有修改，建议您修改{$linkurl}"; break; } $safeMsg[] = $msg; diff --git a/src/admin/makehtml_homepage.php b/src/admin/makehtml_homepage.php index e213ea39..33ce45b6 100644 --- a/src/admin/makehtml_homepage.php +++ b/src/admin/makehtml_homepage.php @@ -81,7 +81,6 @@ if ($dopost == "view") { $GLOBALS['_arclistEnv'] = 'index'; $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet); $pv->SaveToHtml($homeFile); - echo ""; ShowMsg("更新静态首页，点击浏览", "javascript:;"); } else { //动态浏览 diff --git a/src/admin/makehtml_list_action.php b/src/admin/makehtml_list_action.php index fe23f8a7..419248ec 100644 --- a/src/admin/makehtml_list_action.php +++ b/src/admin/makehtml_list_action.php @@ -43,7 +43,7 @@ else if ($gotype == 'mkall') { if (file_exists($mkcachefile)) require_once($mkcachefile); } if (!$idArray) { - ShowMsg("暂无栏目，请添加栏目", "javascript:;"); + ShowMsg("暂无栏目", "javascript:;"); exit; } //当前更新栏目id diff --git a/src/admin/templets/content_i_list.htm b/src/admin/templets/content_i_list.htm index 8ebef8eb..2d3b0e5b 100644 --- a/src/admin/templets/content_i_list.htm +++ b/src/admin/templets/content_i_list.htm @@ -68,7 +68,7 @@ 选择 id 文档标题 - 时间 + 更新时间 栏目 点击 网页 diff --git a/src/admin/templets/content_list.htm b/src/admin/templets/content_list.htm index d716a181..9c128c06 100644 --- a/src/admin/templets/content_list.htm +++ b/src/admin/templets/content_list.htm @@ -3,7 +3,7 @@ - 文档列表 + 所有文档列表 diff --git a/src/admin/templets/content_sg_list.htm b/src/admin/templets/content_sg_list.htm index 5b8650ca..79cc5f33 100644 --- a/src/admin/templets/content_sg_list.htm +++ b/src/admin/templets/content_sg_list.htm @@ -3,7 +3,7 @@ - 文档管理列表 + 单表文档列表 diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm index 006645f0..af9932a5 100644 --- a/src/admin/templets/index_body.htm +++ b/src/admin/templets/index_body.htm @@ -174,20 +174,20 @@
- +
- - - + + +
- - + +
- +
diff --git a/src/apps/download.php b/src/apps/download.php index 7b1d1f5f..74d43f0b 100755 --- a/src/apps/download.php +++ b/src/apps/download.php @@ -165,7 +165,7 @@ else if ($open == 2) { } $memberTypes[0] = "游客或没权限会员"; $msgtitle = "您没有权限下载软件：{$arctitle}"; - $moremsg = "该软件需要等级".$memberTypes[$needRank]."才能下载，您目前等级是".$memberTypes[$cfg_ml->M_Rank]."升级会员"; + $moremsg = "该软件需要等级".$memberTypes[$needRank]."才能下载，您目前等级是".$memberTypes[$cfg_ml->M_Rank]."升级会员"; include_once(DEDETEMPLATE.'/apps/view_msg.htm'); exit(); } diff --git a/src/apps/list.php b/src/apps/list.php index 7eb87f11..2023efb0 100755 --- a/src/apps/list.php +++ b/src/apps/list.php @@ -48,7 +48,7 @@ if (isset($lv->Fields['corank']) && $lv->Fields['corank'] > 0) { } $memberTypes[0] = "游客或没权限会员"; $msgtitle = "您没有权限浏览栏目：{$lv->Fields['typename']}"; - $moremsg = "该栏目需要等级".$memberTypes[$lv->Fields['corank']]."才能浏览，您目前等级是".$memberTypes[$cfg_ml->M_Rank]."升级会员"; + $moremsg = "该栏目需要等级".$memberTypes[$lv->Fields['corank']]."才能浏览，您目前等级是".$memberTypes[$cfg_ml->M_Rank]."升级会员"; include_once(DEDETEMPLATE.'/apps/view_msg_catalog.htm'); exit(); } diff --git a/src/install/index.php b/src/install/index.php index 8b928fde..81f325a2 100644 --- a/src/install/index.php +++ b/src/install/index.php @@ -210,8 +210,7 @@ else if ($step==2) { else $rs = mysql_query(str_replace('#~lang~#',$dblang,$query),$conn); } $query=''; - } else if (!preg_match("#^(\/\/|--)#", $line)) - { + } else if (!preg_match("#^(\/\/|--)#", $line)) { $query .= $line; } } @@ -263,9 +262,8 @@ else if ($step==10) { header("Expires:0\r\n"); $conn = @mysql_connect($dbhost,$dbuser,$dbpwd); $info = ""; - if ($conn) - { - if (empty($dbname)){ + if ($conn) { + if (empty($dbname)) { $info = "信息正确"; } else { $info = mysql_select_db($dbname,$conn)? "数据库已经存在，系统覆盖数据库": "数据库不存在，系统自动创建"; diff --git a/src/system/helpers/upload.helper.php b/src/system/helpers/upload.helper.php index 1f53ffcf..6fe840eb 100755 --- a/src/system/helpers/upload.helper.php +++ b/src/system/helpers/upload.helper.php @@ -143,7 +143,7 @@ if (!function_exists('MemberUploads')) { exit(); } if ($exname == '') { - $filename = $cfg_user_dir."/$userid/".dd2char($nowtme.'-'.mt_rand(1000, 9999)).'.'.$sname; + $filename = $cfg_user_dir."/$userid/".dd2char($nowtme.'-'.mt_rand(1000,9999)).'.'.$sname; } else { $filename = $cfg_user_dir."/{$userid}/{$exname}.".$sname; } diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index 6ef3591f..8c80af7e 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/src/system/typelink/typeunit.class.admin.php @@ -153,7 +153,7 @@ class TypeUnit echo ""; $i++; } if ($i === 0) { - echo "
暂无栏目，请添加栏目
"; + echo "
暂无栏目
"; } } /** diff --git a/src/user/inc/inc_archives_functions.php b/src/user/inc/inc_archives_functions.php index 8f651299..6cbe3f69 100755 --- a/src/user/inc/inc_archives_functions.php +++ b/src/user/inc/inc_archives_functions.php @@ -328,7 +328,7 @@ function GetCurContent(&$body) $itype = '.jpg'; } } - $milliSecondN = dd2char($milliSecond.'-'.mt_rand(1000, 8000)); + $milliSecondN = dd2char($milliSecond.'-'.mt_rand(1000,8000)); $value = trim($value); $rndFileName = $imgPath."/".$milliSecondN.'-'.$key.$itype; $fileurl = $imgUrl."/".$milliSecondN.'-'.$key.$itype; diff --git a/src/user/inc/inc_pwd_functions.php b/src/user/inc/inc_pwd_functions.php index e4456018..0d22983d 100755 --- a/src/user/inc/inc_pwd_functions.php +++ b/src/user/inc/inc_pwd_functions.php @@ -132,7 +132,7 @@ function member($mail, $userid) * @param string $mid 会员id * @param string $userid 账号 * @param string $mailto 发送邮件地址 - * @param string $send 为Y发送邮件,为N不发送邮件默认为Y + * @param string $send 邮件默认为Y，Y发送，N不发送 * @return string */ function sn($mid, $userid, $mailto, $send = 'Y')