From 3444b085bcb0779dd963f57308a3441caeeaa058 Mon Sep 17 00:00:00 2001 From: xushubieli Date: Sat, 23 Apr 2022 17:01:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=AD=97=E4=BD=93=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/actionsearch_class.php | 4 ++-- src/admin/article_keywords_select.php | 2 +- src/admin/catalog_do.php | 2 +- src/admin/dialog/select_images.php | 4 ++-- src/admin/dialog/select_media.php | 8 +++---- src/admin/dialog/select_soft.php | 4 ++-- src/admin/dialog/select_templets.php | 12 +++++------ src/admin/diy_add.php | 2 +- src/admin/feedback_edit.php | 2 +- src/admin/feedback_main.php | 2 +- src/admin/inc/inc_list_functions.php | 6 +++--- src/admin/index_body.php | 2 +- src/admin/js/indexbody.js | 16 ++++++-------- src/admin/member_do.php | 4 ++-- src/admin/member_main.php | 6 +++--- src/admin/member_pm.php | 4 ++-- src/admin/module_main.php | 2 +- src/admin/mychannel_add.php | 4 ++-- src/admin/mychannel_edit.php | 2 +- src/admin/shops_operations_cart.php | 4 ++-- src/admin/sys_admin_user_edit.php | 2 +- src/admin/sys_info.php | 4 ++-- src/admin/sys_repair.php | 10 ++++----- src/admin/sys_safetest.php | 4 ++-- src/admin/sys_sql_query.php | 4 ++-- src/admin/tag_test_action.php | 2 +- src/admin/templets/action_search.htm | 2 +- src/admin/templets/diy_edit_content.htm | 22 ++++++++++---------- src/admin/templets/diy_list.htm | 2 +- src/admin/templets/feedback_main.htm | 20 +++++++++--------- src/admin/templets/member_main.htm | 2 +- src/admin/templets/member_view.htm | 4 ++-- src/admin/templets/module_main.htm | 2 +- src/admin/templets/shops_operations_cart.htm | 2 +- src/admin/templets/sys_data_replace.htm | 2 +- src/admin/templets/update_guide_getfiles.htm | 2 +- src/admin/templets/vote_main.htm | 2 +- src/apps/download.php | 4 ++-- src/apps/list.php | 2 +- src/apps/view.php | 6 +++--- src/system/archive/searchview.class.php | 4 ++-- src/system/database/dedesqli.class.php | 6 +++--- src/system/database/dedesqlite.class.php | 4 ++-- src/system/memberlogin.class.php | 4 ++-- src/system/typelink/typeunit.class.admin.php | 4 ++-- src/theme/plus/car.htm | 2 +- src/user/config.php | 6 +++--- src/user/inc/inc_list_functions.php | 6 +++--- src/user/index_do.php | 12 +++++------ src/user/templets/content_list.htm | 2 +- src/user/templets/content_sg_list.htm | 2 +- src/user/templets/index-notlogin.htm | 2 +- src/user/templets/login.htm | 2 +- src/user/templets/pm-main.htm | 2 +- 54 files changed, 123 insertions(+), 127 deletions(-) diff --git a/src/admin/actionsearch_class.php b/src/admin/actionsearch_class.php index 8c501e5e..8c2d8f1b 100644 --- a/src/admin/actionsearch_class.php +++ b/src/admin/actionsearch_class.php @@ -74,11 +74,11 @@ class ActionSearch foreach ($text as $key => $value) { if ($key == 'title' || $key == 'description') { //仅对title,description进行数组替换 - $text[$key] = str_replace($this->keyword, ''.$this->keyword.'', $text[$key]); + $text[$key] = str_replace($this->keyword, ''.$this->keyword.'', $text[$key]); } } } else { - $text = str_replace($this->keyword, ''.$this->keyword.'', $text); + $text = str_replace($this->keyword, ''.$this->keyword.'', $text); } return $text; } diff --git a/src/admin/article_keywords_select.php b/src/admin/article_keywords_select.php index d0503276..6cea1c91 100644 --- a/src/admin/article_keywords_select.php +++ b/src/admin/article_keywords_select.php @@ -27,7 +27,7 @@ $dlist->Display(); function GetSta($sta) { if ($sta == 1) return "正常"; - else return "禁用"; + else return "禁用"; } function GetMan($sta) diff --git a/src/admin/catalog_do.php b/src/admin/catalog_do.php index 8fb7eee0..c75555e6 100644 --- a/src/admin/catalog_do.php +++ b/src/admin/catalog_do.php @@ -228,7 +228,7 @@ else if ($dopost == 'unitCatalog') { $win->AddHidden('channelid', $channelid); $win->AddHidden('nextjob', 'unitok'); $win->AddTitle("合并目录时不会删除原来的栏目目录，合并后需手动更新目标栏目的文档HTML和列表HTML"); - $win->AddItem('您选择的栏目是：', "$typename($typeid)"); + $win->AddItem('您选择的栏目是：', "$typename($typeid)"); $win->AddItem('您希望合并到那个栏目', ""); $win->AddItem('注意事项：', '栏目不能有下级子栏目，只允许子级到更高级或同级或不同父级的情况'); $winform = $win->GetWindow('ok'); diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php index 42dbfc51..6befd635 100644 --- a/src/admin/dialog/select_images.php +++ b/src/admin/dialog/select_images.php @@ -198,7 +198,7 @@ a{text-decoration:none!important} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $line = " @@ -211,7 +211,7 @@ a{text-decoration:none!important} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $line = " diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php index aaf4cca0..a482b4ce 100644 --- a/src/admin/dialog/select_media.php +++ b/src/admin/dialog/select_media.php @@ -132,7 +132,7 @@ a{text-decoration:none!important} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $line = " $file @@ -144,7 +144,7 @@ a{text-decoration:none!important} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $line = " $file @@ -156,7 +156,7 @@ a{text-decoration:none!important} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $line = " $file @@ -168,7 +168,7 @@ a{text-decoration:none!important} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $line = " $file diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index aa763c2e..56193f5f 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -136,7 +136,7 @@ a{text-decoration:none!important} "; echo "$line"; } else if (preg_match("#\.(zip|rar|tgr.gz)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); @@ -148,7 +148,7 @@ a{text-decoration:none!important} "; echo "$line"; } else { - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ''; $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); diff --git a/src/admin/dialog/select_templets.php b/src/admin/dialog/select_templets.php index 53c7b61d..42c939b0 100644 --- a/src/admin/dialog/select_templets.php +++ b/src/admin/dialog/select_templets.php @@ -115,7 +115,7 @@ a{text-decoration:none!important} "; echo "$line"; } else if (preg_match("#\.(htm|html)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); @@ -127,7 +127,7 @@ a{text-decoration:none!important} "; echo "$line"; } else if (preg_match("#\.(css)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); @@ -139,7 +139,7 @@ a{text-decoration:none!important} "; echo "$line"; } else if (preg_match("#\.(js)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); @@ -151,7 +151,7 @@ a{text-decoration:none!important} "; echo "$line"; } else if (preg_match("#\.(jpg)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); @@ -163,7 +163,7 @@ a{text-decoration:none!important} "; echo "$line"; } else if (preg_match("#\.(gif|png)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); @@ -175,7 +175,7 @@ a{text-decoration:none!important} "; echo "$line"; } else if (preg_match("#\.(txt)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:#dc3545' "; + if ($file == $comeback) $lstyle = " class='text-danger' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); diff --git a/src/admin/diy_add.php b/src/admin/diy_add.php index 346f17be..1293fb4d 100644 --- a/src/admin/diy_add.php +++ b/src/admin/diy_add.php @@ -20,7 +20,7 @@ if (empty($action)) { include(DEDEADMIN."/templets/diy_add.htm"); } else { if (preg_match("#[^0-9-]#", $diyid) || empty($diyid)) { - ShowMsg("'自定义表单diyid'必须为数字", "-1"); + ShowMsg("'自定义表单diyid'必须为数字", "-1"); exit(); } if ($table == "") { diff --git a/src/admin/feedback_edit.php b/src/admin/feedback_edit.php index e4d4d1f4..e1d8c0c1 100644 --- a/src/admin/feedback_edit.php +++ b/src/admin/feedback_edit.php @@ -22,7 +22,7 @@ if ($dopost == 'edit') { $adminmsg = str_replace(">", ">", $adminmsg); $adminmsg = str_replace(" ", "  ", $adminmsg); $adminmsg = str_replace("\r\n", "
\n", $adminmsg); - $msg = $msg."
\n"."管理员回复：$adminmsg\n"; + $msg = $msg."
\n"."管理员回复：$adminmsg\n"; } $query = "UPDATE `#@__feedback` SET username='$username',msg='$msg',ischeck=1 WHERE id=$id"; $dsql->ExecuteNoneQuery($query); diff --git a/src/admin/feedback_main.php b/src/admin/feedback_main.php index bd32d349..6a2e310f 100644 --- a/src/admin/feedback_main.php +++ b/src/admin/feedback_main.php @@ -16,7 +16,7 @@ require_once(DEDEINC."/typelink/typelink.class.php"); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); function IsCheck($st) { - return $st == 1 ? "[已审核]" : "[未审核]"; + return $st == 1 ? "[已审核]" : "[未审核]"; } function jsTrimjajx($str, $len) { diff --git a/src/admin/inc/inc_list_functions.php b/src/admin/inc/inc_list_functions.php index 81e4ce07..0522044d 100644 --- a/src/admin/inc/inc_list_functions.php +++ b/src/admin/inc/inc_list_functions.php @@ -46,7 +46,7 @@ function IsCommendArchives($iscommend) } $sn = trim($sn); if ($sn == '') return ''; - else return "[$sn]"; + else return "[$sn]"; } //获得推荐的标题 function GetCommendTitle($title, $iscommend) @@ -81,7 +81,7 @@ function IsHtmlArchives($ismake) } else if ($ismake == -1) { return "仅动态"; } else { - return "未生成"; + return "未生成"; } } //获得内容的限定级别名称 @@ -105,7 +105,7 @@ function GetRankName($arcrank) function IsPicArchives($picname) { if ($picname != '') { - return "[图]"; + return "[图]"; } else { return ''; } diff --git a/src/admin/index_body.php b/src/admin/index_body.php index 63e239a0..a2becb89 100644 --- a/src/admin/index_body.php +++ b/src/admin/index_body.php @@ -51,7 +51,7 @@ else if ($dopost == 'setskin') { if(trim($row['editcon'])==''){ $row['editcon'] = 'archives_edit.php'; } - $rowarcrank = $row['arcrank']==-1? " [未审核]":""; + $rowarcrank = $row['arcrank']==-1? " [未审核]":""; $pubdate = GetDateMk($row['pubdate']); echo "{$row['title']}{$rowarcrank}{$pubdate}"; } diff --git a/src/admin/js/indexbody.js b/src/admin/js/indexbody.js index 7d585901..faebb199 100644 --- a/src/admin/js/indexbody.js +++ b/src/admin/js/indexbody.js @@ -85,7 +85,7 @@ function LoadServer() { infoStr += ` 授权域名： - ${rsp.result.domain} 查看 + ${rsp.result.domain} 证书 `; } @@ -118,7 +118,7 @@ function LoadServer() { infoStr += ` 版本组件： - 如何启动组件 + 启动组件 `; } else { @@ -126,7 +126,7 @@ function LoadServer() { infoStr += ` 版本组件： - 查看组件信息 + 组件信息 `; } @@ -137,11 +137,11 @@ function LoadServer() { - - + + - +
尚未启动商业版服务，原因：${rsp.msg}当前版本：社区版升级商业版尚未启动商业版组件，原因：${rsp.msg}当前版本：社区版升级商业版
如果您已购买商业版授权，您可以在我们的授权中心查询到相信关授权信息，如果查询结果与实际授权不符，则说明您可能购买了非法商业授权，请及时与我们取得联系，谢谢。如果您已购买商业版授权，可以在我们的授权中心查询到相信关授权信息，如果查询结果与实际授权不符，则说明您可能购买了非法商业授权，请及时与我们取得联系，谢谢。
@@ -230,10 +230,6 @@ async function LoadStatChart() { plugins: { legend: { position: 'top', - }, - title: { - display: true, - text: `${cfg_webname}流量统计图` } } }, diff --git a/src/admin/member_do.php b/src/admin/member_do.php index 9972d13f..748404aa 100644 --- a/src/admin/member_do.php +++ b/src/admin/member_do.php @@ -71,7 +71,7 @@ if ($dopost == "delmember") { $win->AddHidden("randcode", $randcode); $win->AddHidden("safecode", $safecode); $win->AddTitle("您确定要删除会员ID:".$id." 吗"); - $win->AddMsgItem("安全验证串：（复制本代码：$safecode）", "30"); + $win->AddMsgItem("安全验证串：（复制本代码：$safecode）", "30"); $winform = $win->GetWindow("ok"); $win->Display(); } else if ($dopost == "delmembers") { @@ -118,7 +118,7 @@ if ($dopost == "delmember") { $win->AddHidden("randcode", $randcode); $win->AddHidden("safecode", $safecode); $win->AddTitle("您确定要删除(ID:".$id.")这个会员?"); - $win->AddMsgItem(" 安全验证串： (复制本代码：$safecode)", "30"); + $win->AddMsgItem(" 安全验证串： (复制本代码：$safecode)", "30"); $winform = $win->GetWindow("ok"); $win->Display(); } diff --git a/src/admin/member_main.php b/src/admin/member_main.php index 62dc10f9..b4cec48c 100644 --- a/src/admin/member_main.php +++ b/src/admin/member_main.php @@ -85,7 +85,7 @@ function GetMemberName($rank, $mt) { global $MemberTypes; if (isset($MemberTypes[$rank])) { - if ($mt == 'ut') return " 待升级：".$MemberTypes[$rank].""; + if ($mt == 'ut') return " 待升级：".$MemberTypes[$rank].""; else return $MemberTypes[$rank]; } else { if ($mt == 'ut') return ''; @@ -96,6 +96,6 @@ function GetMemberName($rank, $mt) function GetMAtt($m) { if ($m < 1) return ''; - else if ($m == 10) return " [管理员]"; - else return "  [荐]"; + else if ($m == 10) return " [管理员]"; + else return "  [荐]"; } diff --git a/src/admin/member_pm.php b/src/admin/member_pm.php index 4c3c7aba..b0059bf3 100644 --- a/src/admin/member_pm.php +++ b/src/admin/member_pm.php @@ -55,6 +55,6 @@ function GetFolders($me) function IsReader($me) { $me = preg_replace("#[^0-1]#", "", $me); - if ($me) return "√"; - else return "×"; + if ($me) return "√"; + else return "×"; } diff --git a/src/admin/module_main.php b/src/admin/module_main.php index da6b5e77..7fb57b79 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -142,7 +142,7 @@ else if ($action == 'setup') { $prvdir .= "目录可写\r\n"; foreach ($prvdirs as $k => $v) { if ($v) $cw = '√'; - else $cw = '×'; + else $cw = '×'; $prvdir .= "$k"; $prvdir .= "$cw\r\n"; } diff --git a/src/admin/mychannel_add.php b/src/admin/mychannel_add.php index 320753ab..07a1bd70 100644 --- a/src/admin/mychannel_add.php +++ b/src/admin/mychannel_add.php @@ -18,11 +18,11 @@ if (empty($action)) $action = ''; if ($action == 'add') { //检查输入 if (empty($id) || preg_match("#[^0-9-]#", $id)) { - ShowMsg("'频道id'必须为数字", "-1"); + ShowMsg("'频道id'必须为数字", "-1"); exit(); } if (preg_match("#[^a-z0-9]#i", $nid) || $nid == "") { - ShowMsg("'频道名字标识'必须为英文字母或与数字混合字符串", "-1"); + ShowMsg("'频道名字标识'必须为英文字母或与数字混合字符串", "-1"); exit(); } if ($addtable == "") { diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php index 19a137fc..dea55e9b 100644 --- a/src/admin/mychannel_edit.php +++ b/src/admin/mychannel_edit.php @@ -55,7 +55,7 @@ else if ($dopost == "copystart") { $wecome_info = " 频道管理::模型复制"; $win = new OxWindow(); $win->Init("mychannel_edit.php", "js/blank.js", "post"); - $win->AddTitle(" 被复制频道：[".$row['typename']."]"); + $win->AddTitle(" 被复制频道：[".$row['typename']."]"); $win->AddHidden("cid", $id); $win->AddHidden("id", $id); $win->AddHidden("dopost", 'copysave'); diff --git a/src/admin/shops_operations_cart.php b/src/admin/shops_operations_cart.php index 4cdec6b4..6fe0c9d8 100644 --- a/src/admin/shops_operations_cart.php +++ b/src/admin/shops_operations_cart.php @@ -35,10 +35,10 @@ function GetSta($sta, $oid) if ($sta == 0) { return $payname['name']." 手续费:".$payname['fee']."元"; } else if ($sta == 1) { - return '已付款,等发货'; + return '已付款,等发货'; } else if ($sta == 2) { return '确认'; } else { - return '已完成'; + return '已完成'; } } diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php index de5cc3bd..b0b500b8 100644 --- a/src/admin/sys_admin_user_edit.php +++ b/src/admin/sys_admin_user_edit.php @@ -63,7 +63,7 @@ if ($dopost == 'saveedit') { $win->AddHidden("id", $id); $win->AddTitle("系统提示"); $win->AddMsgItem("您确定要删除用户：$userid 吗", "50"); - $win->AddMsgItem("安全验证串：（复制本代码：$safecode）", "30"); + $win->AddMsgItem("安全验证串：（复制本代码：$safecode）", "30"); $winform = $win->GetWindow("ok"); $win->Display(); exit(); diff --git a/src/admin/sys_info.php b/src/admin/sys_info.php index de2f1134..4a89e9b2 100644 --- a/src/admin/sys_info.php +++ b/src/admin/sys_info.php @@ -111,8 +111,8 @@ EOT; while ($row = $dsql->GetArray()) { $bgcolor = ($i++ % 2 == 0) ? "#f8f8f8" : "#ffffff"; - $row['info'] = preg_replace("#{$keywords}#", ''.$keywords.'', $row['info']); - $row['varname'] = preg_replace("#{$keywords}#", ''.$keywords.'', $row['varname']); + $row['info'] = preg_replace("#{$keywords}#", ''.$keywords.'', $row['info']); + $row['varname'] = preg_replace("#{$keywords}#", ''.$keywords.'', $row['varname']); ?> ： diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php index b5d56ac2..54c77a39 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -52,7 +52,7 @@ else if ($dopost == 1) { - +
- 已完成数据结构完整性检测 + 已完成数据结构完整性检测
如果您系统有下面几种问题之一，请检测微表正确性：
1、无法获得主键，因此无法进行后续操作
@@ -99,11 +99,11 @@ else if ($dopost == 2) { $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` "); $msg .= "微统计表记录数：{$row['dd']}
"; if ($row['dd'] == $allarcnum) { - $msg .= "两者记录一致，无需修正
"; + $msg .= "两者记录一致，无需修正
"; } else { $sql = "TRUNCATE TABLE `#@__arctiny`"; $dsql->ExecuteNoneQuery($sql); - $msg .= "两者记录不一致，尝试进行简单修正
"; + $msg .= "两者记录不一致，尝试进行简单修正
"; //导入普通模型微数据 $sql = "INSERT INTO `#@__arctiny`(id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid) SELECT id, typeid, typeid2, arcrank, channel, senddate, sortrank, mid FROM `#@__archives` "; @@ -117,9 +117,9 @@ else if ($dopost == 2) { } $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` "); if ($row['dd'] == $allarcnum) { - $msg .= "修正记录成功
"; + $msg .= "修正记录成功
"; } else { - $msg .= "修正记录失败，建议进行高级综合检测
"; + $msg .= "修正记录失败，建议进行高级综合检测
"; $errall = "结合性检测 "; } } diff --git a/src/admin/sys_safetest.php b/src/admin/sys_safetest.php index 54366a75..425f29b4 100644 --- a/src/admin/sys_safetest.php +++ b/src/admin/sys_safetest.php @@ -76,7 +76,7 @@ if ($action == 'test') { $message = ''; AjaxHead(); TestSafe(DEDEROOT); - if ($message == '') $message = "没发现可疑文件"; + if ($message == '') $message = "没发现可疑文件"; echo $message; exit(); } else if ($action == 'viewdiff') { @@ -113,7 +113,7 @@ else if ($action == 'clear') { @unlink($d.'/'.$filename); } } - $message = "成功清空模板缓存"; + $message = "成功清空模板缓存"; echo $message; exit(); } diff --git a/src/admin/sys_sql_query.php b/src/admin/sys_sql_query.php index 08fcc76e..4e256194 100644 --- a/src/admin/sys_sql_query.php +++ b/src/admin/sys_sql_query.php @@ -107,7 +107,7 @@ else if ($dopost == "query") { echo "记录：$j"; echo "
"; foreach ($row as $k => $v) { - echo "{$k}：{$v}
\r\n"; + echo "{$k}：{$v}
\r\n"; } } exit(); @@ -128,7 +128,7 @@ else if ($dopost == "query") { if ($errCode == "") { $i++; } else { - $nerrCode .= "执行：$q 出错，错误提示：".$errCode."
"; + $nerrCode .= "执行：$q 出错，错误提示：".$errCode."
"; } } echo "成功执行{$i}个SQL语句

"; diff --git a/src/admin/tag_test_action.php b/src/admin/tag_test_action.php index fe40228f..bd4efc12 100644 --- a/src/admin/tag_test_action.php +++ b/src/admin/tag_test_action.php @@ -24,7 +24,7 @@ else $pv = new PartView(); $pv->SetTemplet($partcode, "string"); if ($showsource == "" || $showsource == "yes") { echo "模板代码:"; - echo "
".dede_htmlspecialchars($partcode)."
"; + echo "
".dede_htmlspecialchars($partcode)."
"; echo "结果:
"; } $pv->Display(); \ No newline at end of file diff --git a/src/admin/templets/action_search.htm b/src/admin/templets/action_search.htm index 391c3e0c..6fa2914f 100644 --- a/src/admin/templets/action_search.htm +++ b/src/admin/templets/action_search.htm @@ -13,7 +13,7 @@ 		当前位置  > 搜索结果
""的搜索结果""的搜索结果
diff --git a/src/admin/templets/diy_edit_content.htm b/src/admin/templets/diy_edit_content.htm index 766f771c..e74bcb42 100644 --- a/src/admin/templets/diy_edit_content.htm +++ b/src/admin/templets/diy_edit_content.htm @@ -10,16 +10,16 @@ - +
- '; + echo ''; foreach($fieldlist as $field=>$fielddata) { if($fields[$field]=='') continue; diff --git a/src/admin/templets/feedback_main.htm b/src/admin/templets/feedback_main.htm index fa7eb289..c4042fdf 100644 --- a/src/admin/templets/feedback_main.htm +++ b/src/admin/templets/feedback_main.htm @@ -89,29 +89,29 @@ {dede:datalist empty=''}
表单管理 > 编辑评论
+
- +
$fielddata) @@ -28,27 +28,27 @@ if($row[$field]=='') continue; if($fielddata[1]=='img') { - $row[$field] = " 浏览原图删除原图"; + $row[$field] = " 浏览原图删除原图"; } else if($fielddata[1]=='addon') { - $row[$field] = " 浏览原附件删除原附件"; + $row[$field] = " 浏览原附件删除原附件"; } else { if(!in_array($fielddata[1],$allowhtml)){ $row[$field] = dede_htmlspecialchars($row[$field]); - $row[$field] = ""; + $row[$field] = ""; } } - echo ''; + echo ''; $formfields .= $formfields == ''? $field.','.$fielddata[1] : ';'.$field.','.$fielddata[1]; } echo ""; ?> - +
'.$fielddata[0].':'.''.$row[$field].'
'.$fielddata[0].':'.''.$row[$field].'
- - - + + +
diff --git a/src/admin/templets/diy_list.htm b/src/admin/templets/diy_list.htm index 85053968..b46a6d91 100644 --- a/src/admin/templets/diy_list.htm +++ b/src/admin/templets/diy_list.htm @@ -23,7 +23,7 @@ { $allowhtml = array('htmltext'); $fields['sta'] = $fields['ifcheck'] == 1 ? '已审核':'未审核'; - echo '
'.$fields['id'].' '.$fields['sta'].'
'.$fields['id'].' '.$fields['sta'].'
暂无内容
- +
- - - + + - - - + +
选择 用户：{dede:field.username/} + 选择 用户：{dede:field.username/} 文档：{dede:field.arctitle function="RemoveXSS(@me)"/} (浏览) 0) { ?>（{dede:field.replycount/}条回复） IP地址：{dede:field.ip/}时间：{dede:field.dtime function="GetDateTimeMK(@me)" /} + IP地址：{dede:field.ip/}时间：{dede:field.dtime function="GetDateTimeMK(@me)" /} 编辑评论 更新评论
- +
- {dede:field.ischeck function="IsCheck(@me)" /} - {dede:field.msg function='cn_substr(Text2Html(@me), 150)'/} + {dede:field.ischeck function="IsCheck(@me)"/} + {dede:field.msg function='cn_substr(Text2Html(@me),280)'/}
diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm index 4b394851..12b50df8 100644 --- a/src/admin/templets/member_main.htm +++ b/src/admin/templets/member_main.htm @@ -90,7 +90,7 @@ 		[禁言]"; + if($fields['spacesta']==-2) echo "[禁言]"; if($fields['spacesta']==-1) echo "[未审核]"; if(!empty($fields['face'])) { echo "
"; diff --git a/src/admin/templets/member_view.htm b/src/admin/templets/member_view.htm index 57c2b091..0eb454c1 100644 --- a/src/admin/templets/member_view.htm +++ b/src/admin/templets/member_view.htm @@ -35,7 +35,7 @@ function checkSubmit()
当前用户是网站管理员关连的帐号，请小心操作"; + if($row['matt']==10) echo "当前用户是网站管理员关连的帐号，请小心操作"; ?> @@ -130,7 +130,7 @@ function checkSubmit() - 0)? $mhasDay : '该会员已经到期'; ?> + 0)? $mhasDay : '该会员已经到期'; ?> diff --git a/src/admin/templets/module_main.htm b/src/admin/templets/module_main.htm index d241c2e9..1ba95243 100644 --- a/src/admin/templets/module_main.htm +++ b/src/admin/templets/module_main.htm @@ -54,7 +54,7 @@ diff --git a/src/admin/templets/shops_operations_cart.htm b/src/admin/templets/shops_operations_cart.htm index 28bc59ca..bb03a80e 100644 --- a/src/admin/templets/shops_operations_cart.htm +++ b/src/admin/templets/shops_operations_cart.htm @@ -73,7 +73,7 @@ diff --git a/src/admin/templets/sys_data_replace.htm b/src/admin/templets/sys_data_replace.htm index 910d1c57..c17d115d 100644 --- a/src/admin/templets/sys_data_replace.htm +++ b/src/admin/templets/sys_data_replace.htm @@ -66,7 +66,7 @@ $dsql->SetQuery("Show Tables"); $dsql->Execute('t'); if($dsql->GetError()!=''){ - echo "找不到您所指定的数据库 $dbname
"; + echo "找不到您所指定的数据库 $dbname
"; echo $qbutton; } echo " - + diff --git a/src/admin/templets/vote_main.htm b/src/admin/templets/vote_main.htm index 007f82ad..107f7669 100644 --- a/src/admin/templets/vote_main.htm +++ b/src/admin/templets/vote_main.htm @@ -33,7 +33,7 @@ - + diff --git a/src/user/templets/content_sg_list.htm b/src/user/templets/content_sg_list.htm index d6afa835..43fac4b9 100755 --- a/src/user/templets/content_sg_list.htm +++ b/src/user/templets/content_sg_list.htm @@ -73,7 +73,7 @@ =0) echo "已审核"; else if($fields['arcrank']==-2) echo "被退回"; - else echo "未审核"; + else echo "未审核"; ?> diff --git a/src/user/templets/index-notlogin.htm b/src/user/templets/index-notlogin.htm index 29ef308f..7155f495 100755 --- a/src/user/templets/index-notlogin.htm +++ b/src/user/templets/index-notlogin.htm @@ -38,7 +38,7 @@ 注 册 - 忘记密码 + 忘记密码 diff --git a/src/user/templets/login.htm b/src/user/templets/login.htm index 60a8bdb3..3e307e3e 100755 --- a/src/user/templets/login.htm +++ b/src/user/templets/login.htm @@ -38,7 +38,7 @@ 注 册 - 忘记密码 + 忘记密码 diff --git a/src/user/templets/pm-main.htm b/src/user/templets/pm-main.htm index 1c44c022..b24bccf2 100755 --- a/src/user/templets/pm-main.htm +++ b/src/user/templets/pm-main.htm @@ -90,7 +90,7 @@
会员天数： （如果您要升级会员，会员天数必须大于0）
会员剩余天数： ".$v['lang'].""; + if($cfg_soft_lang != $v['lang']) echo "".$v['lang'].""; else echo $v['lang']; ?>
- 订单总计: {dede:field.priceCount/}元，{dede:pagelist listsize='6'/} + 订单总计: {dede:field.priceCount/}元，{dede:pagelist listsize='6'/}
下载的文件临时存放在文件夹（../data/）内，如果某些基础类有重要的改动导致更新中途中错，您可以从这文件夹提取文件手工更新下载的文件临时存放在文件夹（../data/）内，如果某些基础类有重要的改动导致更新中途中错，您可以从这文件夹提取文件手工更新
{dede:field.starttime function="GetDateMk(@me)" /} {dede:field.endtime function="GetDateMk(@me)" /} {dede:field.totalcount /}未启用";} else {echo "启用";} ?>未启用";} else {echo "启用";} ?> 代码 修改 diff --git a/src/apps/download.php b/src/apps/download.php index 8b7d7d6d..aadf00f7 100755 --- a/src/apps/download.php +++ b/src/apps/download.php @@ -172,7 +172,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.'/plus/view_msg.htm'); exit(); } @@ -186,7 +186,7 @@ else if ($open == 2) { //没有足够的金币 if ($needMoney > $cfg_ml->M_Money || $cfg_ml->M_Money == '') { $msgtitle = "您没有权限下载软件：{$arctitle}"; - $moremsg = "这个软件需要 ".$needMoney." 金币 才能下载，您目前拥有金币：".$cfg_ml->M_Money." 个 "; + $moremsg = "这个软件需要 ".$needMoney." 金币 才能下载，您目前拥有金币：".$cfg_ml->M_Money." 个 "; include_once(DEDETEMPLATE.'/plus/view_msg.htm'); exit(0); } diff --git a/src/apps/list.php b/src/apps/list.php index 69c83021..a40342be 100755 --- a/src/apps/list.php +++ b/src/apps/list.php @@ -46,7 +46,7 @@ if ($tinfos['issystem'] == -1) { } $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.'/plus/view_msg_catalog.htm'); exit(); } diff --git a/src/apps/view.php b/src/apps/view.php index 61dc1c83..99b43eec 100755 --- a/src/apps/view.php +++ b/src/apps/view.php @@ -47,7 +47,7 @@ if ($needMoney > 0 || $needRank > 1) { } $memberTypes[0] = "游客或没权限会员"; $msgtitle = "您没有权限浏览文档：{$arctitle} "; - $moremsg = "这篇文档需要 ".$memberTypes[$needRank]." 才能访问，您目前是：".$memberTypes[$cfg_ml->M_Rank]." "; + $moremsg = "这篇文档需要 ".$memberTypes[$needRank]." 才能访问，您目前是：".$memberTypes[$cfg_ml->M_Rank]." "; include_once(DEDETEMPLATE.'/plus/view_msg.htm'); exit(); } @@ -59,7 +59,7 @@ if ($needMoney > 0 || $needRank > 1) { if (!is_array($row)) { if ($cfg_ml->M_Money == '' || $needMoney > $cfg_ml->M_Money) { $msgtitle = "您没有权限浏览文档：{$arctitle} "; - $moremsg = "这篇文档需要 ".$needMoney." 金币 才能访问，您目前拥有金币：".$cfg_ml->M_Money." 个 "; + $moremsg = "这篇文档需要 ".$needMoney." 金币 才能访问，您目前拥有金币：".$cfg_ml->M_Money." 个 "; include_once(DEDETEMPLATE.'/plus/view_msg.htm'); $arc->Close(); exit(); @@ -81,7 +81,7 @@ if ($needMoney > 0 || $needRank > 1) { } } $msgtitle = "扣金币购买阅读"; - $moremsg = "阅读该文档内容需要付费
这篇文档需要 ".$needMoney." 金币 才能访问，您目前拥有金币 ".$cfg_ml->M_Money." 个
确认阅读请点 [确认付点阅读]"; + $moremsg = "阅读该文档内容需要付费
这篇文档需要 ".$needMoney." 金币 才能访问，您目前拥有金币 ".$cfg_ml->M_Money." 个
确认阅读请点 [确认付点阅读]"; include_once($cfg_basedir.$cfg_templets_dir."/plus/view_msg.htm"); $arc->Close(); exit(); diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php index fb97caff..c61c7e41 100755 --- a/src/system/archive/searchview.class.php +++ b/src/system/archive/searchview.class.php @@ -315,9 +315,9 @@ class SearchView continue; } //这里不区分大小写进行关键词替换 - $fstr = str_ireplace($k, "$k", $fstr); + $fstr = str_ireplace($k, "$k", $fstr); //速度更快,效率更高 - //$fstr = str_replace($k, "$k", $fstr); + //$fstr = str_replace($k, "$k", $fstr); } return $fstr; } diff --git a/src/system/database/dedesqli.class.php b/src/system/database/dedesqli.class.php index 7db6db66..aae3da9f 100755 --- a/src/system/database/dedesqli.class.php +++ b/src/system/database/dedesqli.class.php @@ -112,7 +112,7 @@ class DedeSqli mysqli_real_connect($this->linkID, $dbhost, $this->dbUser, $this->dbPwd, false, $dbport); mysqli_errno($this->linkID) != 0 && $this->DisplayError('链接('.$this->pconnect.') 到MySQL发生错误'); } catch (Exception $e) { - $this->DisplayError("连接数据库失败，可能数据库密码不对或数据库服务器出错"); + $this->DisplayError("连接数据库失败，可能数据库密码不对或数据库服务器出错"); exit; } @@ -121,7 +121,7 @@ class DedeSqli } //处理错误，成功连接则选择数据库 if (!$this->linkID) { - $this->DisplayError("连接数据库失败，可能数据库密码不对或数据库服务器出错"); + $this->DisplayError("连接数据库失败，可能数据库密码不对或数据库服务器出错"); exit(); } $this->isInit = TRUE; @@ -309,7 +309,7 @@ class DedeSqli } } if ($this->result[$id] === FALSE) { - $this->DisplayError(mysqli_error($this->linkID)."
Error sql: ".$this->queryString.""); + $this->DisplayError(mysqli_error($this->linkID)."
Error sql: ".$this->queryString.""); } } function Query($id = "me", $sql = '') diff --git a/src/system/database/dedesqlite.class.php b/src/system/database/dedesqlite.class.php index 1bd48a80..5ae4c87b 100755 --- a/src/system/database/dedesqlite.class.php +++ b/src/system/database/dedesqlite.class.php @@ -114,7 +114,7 @@ class DedeSqlite } //处理错误，成功连接则选择数据库 if (!$this->linkID) { - $this->DisplayError("系统提示：连接数据库失败，可能数据库密码不对或数据库服务器出错"); + $this->DisplayError("系统提示：连接数据库失败，可能数据库密码不对或数据库服务器出错"); exit(); } $this->isInit = TRUE; @@ -265,7 +265,7 @@ class DedeSqlite //echo $this->queryString."--{$queryTime}
\r\n"; } if ($this->result[$id] === FALSE) { - $this->DisplayError($this->linkID->lastErrorMsg()."
Error sql: ".$this->queryString.""); + $this->DisplayError($this->linkID->lastErrorMsg()."
Error sql: ".$this->queryString.""); } } function Query($id = "me", $sql = '') diff --git a/src/system/memberlogin.class.php b/src/system/memberlogin.class.php index ad12cc9d..3afd2ee6 100755 --- a/src/system/memberlogin.class.php +++ b/src/system/memberlogin.class.php @@ -451,8 +451,8 @@ class MemberLogin $sta .= "您目前的身份是：".$row['membername']; $rs = $dsql->GetOne("Select id From `#@__admin` where userid='".$this->M_LoginID."'"); if (!is_array($rs)) { - if ($this->M_Rank > 10 && $this->M_HasDay > 0) $sta .= " 剩余天数: ".$this->M_HasDay." 天 "; - elseif ($this->M_Rank > 10) $sta .= " 会员升级已经到期 "; + if ($this->M_Rank > 10 && $this->M_HasDay > 0) $sta .= " 剩余天数: ".$this->M_HasDay." 天 "; + elseif ($this->M_Rank > 10) $sta .= " 会员升级已经到期 "; } } $sta .= " 拥有金币：{$this->M_Money} 个， 积分：{$this->M_Scores} 分"; diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index 915acf9f..3f9ef333 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/src/system/typelink/typeunit.class.admin.php @@ -109,7 +109,7 @@ class TypeUnit $id = $row->id; $rank = $row->sortrank; if ($row->ishidden == '1') { - $nss = "[隐藏]"; + $nss = "[隐藏]"; } else { $nss = ''; } @@ -192,7 +192,7 @@ class TypeUnit } $rank = $row->sortrank; if ($row->ishidden == '1') { - $nss = "[隐藏]"; + $nss = "[隐藏]"; } else { $nss = ''; } diff --git a/src/theme/plus/car.htm b/src/theme/plus/car.htm index cef1c231..2da50148 100644 --- a/src/theme/plus/car.htm +++ b/src/theme/plus/car.htm @@ -56,7 +56,7 @@
-
共 {dede:var.carts.cart_count/} 件商品，合计: {dede:var.carts.price_count/} 元
+
共 {dede:var.carts.cart_count/} 件商品，合计: {dede:var.carts.price_count/} 元
diff --git a/src/user/config.php b/src/user/config.php index 190afdd5..7d5d29a4 100755 --- a/src/user/config.php +++ b/src/user/config.php @@ -161,7 +161,7 @@ function CheckRank($rank = 0, $money = 0) ShowMsg("邮箱地址为空，请设置一个可用的邮箱地址", "edit_email.php", 0, 5000); exit; } - $msg = "您尚未进行邮件验证，请到邮箱查阅
重新发送邮件验证 点击此处"; + $msg = "您尚未进行邮件验证，请到邮箱查阅
重新发送邮件验证 点击此处"; ShowMsg($msg, "-1", 0, 5000); exit; } @@ -183,10 +183,10 @@ function CheckRank($rank = 0, $money = 0) $myname = "普通会员"; } } - ShowMsg("对不起，需要：$needname 才能访问本页面
您目前的等级是：$myname ", "-1", 0, 5000); + ShowMsg("对不起，需要：$needname 才能访问本页面
您目前的等级是：$myname ", "-1", 0, 5000); exit(); } else if ($cfg_ml->M_Money < $money) { - ShowMsg("对不起，需要花费金币：$money 才能访问本页面
您目前拥有的金币是：".$cfg_ml->M_Money." ", "-1", 0, 5000); + ShowMsg("对不起，需要花费金币：$money 才能访问本页面
您目前拥有的金币是：".$cfg_ml->M_Money." ", "-1", 0, 5000); exit(); } } diff --git a/src/user/inc/inc_list_functions.php b/src/user/inc/inc_list_functions.php index c0dbc387..5b0e94ba 100755 --- a/src/user/inc/inc_list_functions.php +++ b/src/user/inc/inc_list_functions.php @@ -39,7 +39,7 @@ function IsCommendArchives($iscommend) function GetCommendTitle($title, $iscommend) { if (preg_match('/c/', $iscommend)) { - $title = "$title(推荐)"; + $title = "$title(推荐)"; } return "$title"; } @@ -87,7 +87,7 @@ function IsHtmlArchives($ismake) } else if ($ismake == -1) { return "仅动态"; } else { - return "未生成"; + return "未生成"; } } /** @@ -121,7 +121,7 @@ function GetRankName($arcrank) function IsPicArchives($picname) { if ($picname != "") { - return "[图]"; + return "[图]"; } else { return ""; } diff --git a/src/user/index_do.php b/src/user/index_do.php index d1eb789a..6a886c5d 100755 --- a/src/user/index_do.php +++ b/src/user/index_do.php @@ -95,9 +95,9 @@ else if ($fmdo == 'user') { $msg = CheckUserID($uid, $msgtitle, false); } if ($msg == 'ok') { - $msg = "√{$msgtitle}可以使用"; + $msg = "√{$msgtitle}可以使用"; } else { - $msg = "×{$msg}"; + $msg = "×{$msg}"; } echo $msg; exit(); @@ -107,16 +107,16 @@ else if ($fmdo == 'user') { AjaxHead(); if ($cfg_md_mailtest == 'N') { - $msg = "√可以使用"; + $msg = "√可以使用"; } else { if (!CheckEmail($email)) { - $msg = "×Email格式有误"; + $msg = "×Email格式有误"; } else { $row = $dsql->GetOne("SELECT mid FROM `#@__member` WHERE email LIKE '$email' LIMIT 1"); if (!is_array($row)) { - $msg = "√可以使用"; + $msg = "√可以使用"; } else { - $msg = "×Email已经被另一个帐号占用"; + $msg = "×Email已经被另一个帐号占用"; } } } diff --git a/src/user/templets/content_list.htm b/src/user/templets/content_list.htm index b5b6b96f..6a16edbb 100755 --- a/src/user/templets/content_list.htm +++ b/src/user/templets/content_list.htm @@ -73,7 +73,7 @@
=0) echo "已审核"; else if($fields['arcrank']==-2) echo "被退回"; - else echo "未审核"; + else echo "未审核"; ?>
未阅读" : '已阅读'); + $readmsg = ($fields['hasview']==0 ? "未阅读" : '已阅读'); echo $readmsg; ?>