diff --git a/src/admin/actionsearch_class.php b/src/admin/actionsearch_class.php index 8c501e5e..56dd05b2 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..1ec81897 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/article_template_rand.php b/src/admin/article_template_rand.php index 03c9437f..f9938aed 100644 --- a/src/admin/article_template_rand.php +++ b/src/admin/article_template_rand.php @@ -96,7 +96,7 @@ function DoRand(jobname) 如果您想对旧的文章应用随机模板设置，请点击此对旧文章进行处理（必须设置好模板项）  设置全部  取消全部 -  $okmsg +  $okmsg diff --git a/src/admin/article_test_title.php b/src/admin/article_test_title.php index 2a7eed31..52160b3b 100644 --- a/src/admin/article_test_title.php +++ b/src/admin/article_test_title.php @@ -14,5 +14,5 @@ if (empty($t) || $cfg_check_title == 'N') exit; $row = $dsql->GetOne("SELECT id FROM `#@__archives` WHERE title LIKE '$t' "); if (is_array($row)) { - echo "提示：系统已经存在标题为 '$t' 的文档[关闭]"; + echo "提示：系统已经存在标题为 '$t' 的文档[关闭]"; } diff --git a/src/admin/catalog_do.php b/src/admin/catalog_do.php index 8212af98..e60f768c 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/css/albumupload.css b/src/admin/css/albumupload.css index 68b3e988..b8c17641 100644 --- a/src/admin/css/albumupload.css +++ b/src/admin/css/albumupload.css @@ -1 +1 @@ -div.flash{margin:10px 5px;width:375px;border-color:#D9E4FF;border-radius:.2rem}#btnSubmit{margin:0 0 0 155px}.progressWrapper{width:357px;overflow:hidden}.progressContainer{padding:4px;margin:5px;background-color:#f8f8f8;border:solid 1px #E8E8E8;overflow:hidden}.message{margin:10px 0;padding:10px 20px;background-color:#FFC;border:solid 1px #FD9;overflow:hidden}.red{background-color:#FFEBEB;border:solid 1px #B50000}.green{background-color:#EBFFEB;border:solid 1px #DDF0DD}.blue{background-color:#F0F5FF;border:solid 1px #CEE2F2}.progressName{width:320px;height:14px;text-align:left;white-space:nowrap;overflow:hidden}.progressBarInProgress,.progressBarComplete,.progressBarError{margin-top:2px;width:0;height:2px;font-size:0;background-color:blue}.progressBarComplete{width:100%;background-color:green;visibility:hidden}.progressBarError{width:100%;background-color:#dc3545;visibility:hidden}.progressBarStatus{margin-top:2px;width:340px;text-align:left;white-space:nowrap}a.progressCancel{font-size:0;display:block;height:14px;width:14px;background-image:url(../../images/cancelbutton.gif);background-repeat:no-repeat;background-position:-14px 0;float:right}a.progressCancel:hover{background-position:0 0}.swfupload{vertical-align:top}.albCt{float:left;width:240px;height:180px;margin-right:10px;margin-bottom:10px;border:1px dashed #eee;background:#f8f8f8;text-align:center;padding:10px}.albEdit{height:180px}.picinfo{height:30px;line-height:30px;margin:10px 0}.thumbnails img,.thumbnailsEdit img{margin:5px}.albCt img{height:100px!important} \ No newline at end of file +div.flash{margin:10px 5px;width:375px;border-color:#D9E4FF;border-radius:.2rem}#btnSubmit{margin:0 0 0 155px}.progressWrapper{width:357px;overflow:hidden}.progressContainer{padding:4px;margin:5px;background-color:#f8f8f8;border:solid 1px #E8E8E8;overflow:hidden}.message{margin:10px 0;padding:10px 20px;background-color:#FFC;border:solid 1px #FD9;overflow:hidden}.red{background-color:#FFEBEB;border:solid 1px #B50000}.green{background-color:#EBFFEB;border:solid 1px #DDF0DD}.blue{background-color:#F0F5FF;border:solid 1px #CEE2F2}.progressName{width:320px;height:14px;text-align:left;white-space:nowrap;overflow:hidden}.progressBarInProgress,.progressBarComplete,.progressBarError{margin-top:2px;width:0;height:2px;font-size:0;background-color:blue}.progressBarComplete{width:100%;background-color:green;visibility:hidden}.progressBarError{width:100%;background-color:#ff5722;visibility:hidden}.progressBarStatus{margin-top:2px;width:340px;text-align:left;white-space:nowrap}a.progressCancel{font-size:0;display:block;height:14px;width:14px;background-image:url(../../images/cancelbutton.gif);background-repeat:no-repeat;background-position:-14px 0;float:right}a.progressCancel:hover{background-position:0 0}.swfupload{vertical-align:top}.albCt{float:left;width:240px;height:180px;margin-right:10px;margin-bottom:10px;border:1px dashed #eee;background:#f8f8f8;text-align:center;padding:10px}.albEdit{height:180px}.picinfo{height:30px;line-height:30px;margin:10px 0}.thumbnails img,.thumbnailsEdit img{margin:5px}.albCt img{height:100px!important} \ No newline at end of file diff --git a/src/admin/css/indexbody.css b/src/admin/css/indexbody.css index 3b781e1d..dd2633a8 100644 --- a/src/admin/css/indexbody.css +++ b/src/admin/css/indexbody.css @@ -1 +1 @@ -.title{color:#009688}.title span{padding-left:6px}#addTab{position:absolute;left:460px;top:260px;min-width:360px;height:200px;z-index:2;background:#fff;border:1px solid #ccc;padding:0;display:none;border-radius:.2rem}#editTab{position:absolute;left:460px;top:260px;min-width:360px;height:300px;z-index:1;background:#fff;border:1px solid #ccc;padding:0;display:none;border-radius:.2rem}.txt{float:left}.updatedvt{width:98%;border-bottom:1px dashed #dcdcdc}.upinfotitle{border-bottom:1px solid #ccc;color:#dc3545;font-weight:bold}.verline{border-bottom:1px dashed #ccc}.itemTable{background:#CBD8AC}#loaddiv{top:0;left:0;background:#ccc;filter:Alpha(opacity=70);-moz-opacity:0.7;position:absolute;z-index:10000;width:100%;height:100%}#mainmsg{padding-right:8px}.rightside{width:49%;float:left;margin-right:1%;height:670px}.column{width:49%;float:left;margin-right:0.5%}.placeholder{width:98%;margin-left:1%;background:#f0f0f0;border:1px dashed #ddd}.dbox{border:1px solid #DEEAB6;width:98%;margin-left:1%;margin-top:8px}.dbox dt{height:28px;line-height:28px;font-weight:bold;color:#4D6C2F;cursor:move}.dbox dt .l{float:left;padding-left:8px}.dbox dt .r{float:right;padding-right:8px}.dbox dt.lside{border-bottom:1px solid #CFD7C4;background:rgb(239,248,229)}.dbox dt.rside{border-bottom:1px solid #DEEAB6;background:url(../../static/web/img/wbg.gif)repeat-x}.dbox dd{padding:0}.dbox dd.intable{padding-top:0}#updatetest{padding:6px;padding-left:110px;background:url(../../images/ico_spider.gif)no-repeat scroll 10px 15px transparent}.dboxtable td.nline{height:26px;border-bottom:1px dashed #CFD7C4}.dboxtable1 ul li{float:left;display:inline;width:48%;height:26px;line-height:26px;border-bottom:1px dashed #CFD7C4;text-align:center}.biz p{padding:0 15px}.biz img{float:right;margin:40px 15px 0 15px} \ No newline at end of file +.title{color:#009688}.title span{padding-left:6px}#addTab{position:absolute;left:460px;top:260px;min-width:360px;height:200px;z-index:2;background:#fff;border:1px solid #ccc;padding:0;display:none;border-radius:.2rem}#editTab{position:absolute;left:460px;top:260px;min-width:360px;height:300px;z-index:1;background:#fff;border:1px solid #ccc;padding:0;display:none;border-radius:.2rem}.txt{float:left}.updatedvt{width:98%;border-bottom:1px dashed #dcdcdc}.upinfotitle{border-bottom:1px solid #ccc;color:#ff5722;font-weight:bold}.verline{border-bottom:1px dashed #ccc}.itemTable{background:#CBD8AC}#loaddiv{top:0;left:0;background:#ccc;filter:Alpha(opacity=70);-moz-opacity:0.7;position:absolute;z-index:10000;width:100%;height:100%}#mainmsg{padding-right:8px}.rightside{width:49%;float:left;margin-right:1%;height:670px}.column{width:49%;float:left;margin-right:0.5%}.placeholder{width:98%;margin-left:1%;background:#f0f0f0;border:1px dashed #ddd}.dbox{border:1px solid #DEEAB6;width:98%;margin-left:1%;margin-top:8px}.dbox dt{height:28px;line-height:28px;font-weight:bold;color:#4D6C2F;cursor:move}.dbox dt .l{float:left;padding-left:8px}.dbox dt .r{float:right;padding-right:8px}.dbox dt.lside{border-bottom:1px solid #CFD7C4;background:rgb(239,248,229)}.dbox dt.rside{border-bottom:1px solid #DEEAB6;background:url(../../static/web/img/wbg.gif)repeat-x}.dbox dd{padding:0}.dbox dd.intable{padding-top:0}#updatetest{padding:6px;padding-left:110px;background:url(../../images/ico_spider.gif)no-repeat scroll 10px 15px transparent}.dboxtable td.nline{height:26px;border-bottom:1px dashed #CFD7C4}.dboxtable1 ul li{float:left;display:inline;width:48%;height:26px;line-height:26px;border-bottom:1px dashed #CFD7C4;text-align:center}.biz p{padding:0 15px}.biz img{float:right;margin:40px 15px 0 15px} \ No newline at end of file diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php index e13f30c7..e46fd68f 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 = " style='color:#ff5722' "; 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 = " style='color:#ff5722' "; else $lstyle = ""; $line = " diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php index d79793c6..7ef37218 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 = " style='color:#ff5722' "; 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 = " style='color:#ff5722' "; 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 = " style='color:#ff5722' "; 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 = " style='color:#ff5722' "; else $lstyle = ""; $line = " $file diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index 3ee9567d..84200c58 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 = " style='color:#ff5722' "; 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 = " style='color:#ff5722' "; 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 ead24125..9e5284ee 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 = " style='color:#ff5722' "; 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 = " style='color:#ff5722' "; 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 = " style='color:#ff5722' "; 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 = " style='color:#ff5722' "; 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 = " style='color:#ff5722' "; 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 = " style='color:#ff5722' "; 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..4d1163bc 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..8eded233 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..e998bd5a 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..adbb9f3b 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/member_do.php b/src/admin/member_do.php index 9c26ba0f..8e6384cd 100644 --- a/src/admin/member_do.php +++ b/src/admin/member_do.php @@ -72,7 +72,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") { @@ -121,7 +121,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 dc42a348..eee4e472 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 4d6b8942..28979f6c 100644 --- a/src/admin/member_pm.php +++ b/src/admin/member_pm.php @@ -56,5 +56,5 @@ function IsReader($me) { $me = preg_replace("#[^0-1]#", "", $me); if ($me) return "√"; - else return "×"; + else return "×"; } diff --git a/src/admin/module_main.php b/src/admin/module_main.php index fc31abb3..f4e82fa3 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -91,7 +91,7 @@ else if ($action == 'view_developoer') { } $authAt = date("Y-m-d", $devInfo['auth_at']); if (!isset($info['dev_id'])) { - $devInfo['dev_name'] = $info['team']."未认证"; + $devInfo['dev_name'] = $info['team']."未认证"; $authAt = "未知"; } ShowMsg("

开发者名称：{$devInfo['dev_name']}

开发者ID：{$devInfo['dev_id']}

认证于：{$authAt}", "-1"); @@ -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 062e42b7..5c7c19ea 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 2aa5ff62..949c7dee 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..39573686 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 b4077aa8..5a61bf8b 100644 --- a/src/admin/sys_admin_user_edit.php +++ b/src/admin/sys_admin_user_edit.php @@ -64,7 +64,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 99d14b06..25bedaf9 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 7e589014..27e72c2b 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -112,7 +112,7 @@ else if ($dopost == 2) { } 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` "; @@ -128,7 +128,7 @@ else if ($dopost == 2) { if ($row['dd'] == $allarcnum) { $msg .= "

修正记录成功


"; } else { - $msg .= "

修正记录失败，建议进行高级综合检测


"; + $msg .= "

修正记录失败，建议进行高级综合检测


"; $errall = " 进行高级结合性检测> "; } } diff --git a/src/admin/sys_sql_query.php b/src/admin/sys_sql_query.php index 08fcc76e..4eee1241 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..8ce61892 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 bfb16625..de504084 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/makeremote_all.htm b/src/admin/templets/makeremote_all.htm index ab8d7627..fb0622aa 100644 --- a/src/admin/templets/makeremote_all.htm +++ b/src/admin/templets/makeremote_all.htm @@ -58,7 +58,7 @@ function changeDopost(postval) ?> - [系统]' : '' ; ?> + [系统]' : '' ; ?> diff --git a/src/admin/templets/member_view.htm b/src/admin/templets/member_view.htm index feabc8a7..eb533a36 100644 --- a/src/admin/templets/member_view.htm +++ b/src/admin/templets/member_view.htm @@ -36,7 +36,7 @@ function checkSubmit() 当前用户是网站管理员关连的帐号，请小心操作"; + if($row['matt']==10) echo "当前用户是网站管理员关连的帐号，请小心操作"; ?> @@ -145,7 +145,7 @@ function checkSubmit() - 0)? $mhasDay : '该会员已经到期'; ?> + 0)? $mhasDay : '该会员已经到期'; ?> @@ -157,7 +157,7 @@ function checkSubmit() (0为普通，1为推荐，10为管理员[不能在前台登录] - {非管理员ID是严格使用10属性的，要新建管理在 系统帐号 的地方增加}) + {非管理员ID是严格使用10属性的，要新建管理在 系统帐号 的地方增加}) diff --git a/src/admin/templets/module_main.htm b/src/admin/templets/module_main.htm index 7fbe8a3f..b1b284db 100644 --- a/src/admin/templets/module_main.htm +++ b/src/admin/templets/module_main.htm @@ -63,7 +63,7 @@ @@ -78,7 +78,7 @@ echo "未安装安装"; } } else { - echo "
未下载 下载
"; + echo "
未下载 下载
"; } ?> diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm index 0b6d9318..d34a9d2c 100644 --- a/src/admin/templets/mychannel_edit.htm +++ b/src/admin/templets/mychannel_edit.htm @@ -99,7 +99,7 @@ { ?> -
- 订单总计: {dede:field.priceCount/}元, {dede:pagelist listsize=3/} + 订单总计: {dede:field.priceCount/}元, {dede:pagelist listsize=3/}
diff --git a/src/admin/templets/sys_data_replace.htm b/src/admin/templets/sys_data_replace.htm index b8f299e2..18c47fdf 100644 --- a/src/admin/templets/sys_data_replace.htm +++ b/src/admin/templets/sys_data_replace.htm @@ -73,7 +73,7 @@ $dsql->SetQuery("Show Tables"); $dsql->Execute('t'); if($dsql->GetError()!=''){ - echo "找不到您所指定的数据库 $dbname
"; + echo "找不到您所指定的数据库 $dbname
"; echo $qbutton; } echo "
diff --git a/src/admin/testenv.php b/src/admin/testenv.php index 352ba116..5a0559bd 100644 --- a/src/admin/testenv.php +++ b/src/admin/testenv.php @@ -289,35 +289,35 @@ $action = isset($action) ? $action : ''; $rs = TestExecuteable(DEDEROOT.$key, $cfg_basehost, $cfg_cmspath); if ($rs === -1) { - echo "无法判断"; + echo "无法判断"; } else { if ($val['execute'] == true) - echo $rs != $val['execute'] ? "错误(不可执行)" : "正常(可执行)"; + echo $rs != $val['execute'] ? "错误(不可执行)" : "正常(可执行)"; else - echo $rs != $val['execute'] ? "错误(可执行)" : "正常(不可执行)"; + echo $rs != $val['execute'] ? "错误(可执行)" : "正常(不可执行)"; } ?>|错误(不可读)" : "正常(可读)"; + echo is_readable(DEDEROOT.$key) != $val['read'] ? "错误(不可读)" : "正常(可读)"; else - echo is_readable(DEDEROOT.$key) != $val['read'] ? "错误(可读)" : "正常(不可读)"; + echo is_readable(DEDEROOT.$key) != $val['read'] ? "错误(可读)" : "正常(不可读)"; ?>|错误(不可写)" : "正常(可写)"; + echo TestWriteable(DEDEROOT.$key) != $val['write'] ? "错误(不可写)" : "正常(可写)"; else - echo TestWriteable(DEDEROOT.$key) != $val['write'] ? "错误(可写)" : "正常(不可写)"; + echo TestWriteable(DEDEROOT.$key) != $val['write'] ? "错误(可写)" : "正常(不可写)"; ?>|无需判断|错误(不可读)" : "正常(可读)"; + echo is_readable(DEDEROOT.$key) != $val['read'] ? "错误(不可读)" : "正常(可读)"; else - echo is_readable(DEDEROOT.$key) != $val['read'] ? "错误(可读)" : "正常(不可读)"; + echo is_readable(DEDEROOT.$key) != $val['read'] ? "错误(可读)" : "正常(不可读)"; ?>|错误(不可写)" : "正常(可写)"; + echo is_writable(DEDEROOT.$key) != $val['write'] ? "错误(不可写)" : "正常(可写)"; else - echo is_writable(DEDEROOT.$key) != $val['write'] ? "错误(可写)" : "正常(不可写)"; + echo is_writable(DEDEROOT.$key) != $val['write'] ? "错误(可写)" : "正常(不可写)"; ?>".$memberTypes[$needRank]." 才能下载，您目前是：".$memberTypes[$cfg_ml->M_Rank]." "; + $moremsg = "这个软件需要 ".$memberTypes[$needRank]." 才能下载，您目前是：".$memberTypes[$cfg_ml->M_Rank]." "; include_once(DEDETEMPLATE.'/plus/view_msg.htm'); exit(); } @@ -187,7 +187,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 130dddf4..7f37ad3a 100755 --- a/src/apps/list.php +++ b/src/apps/list.php @@ -47,7 +47,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 be256302..7f60ee59 100755 --- a/src/apps/view.php +++ b/src/apps/view.php @@ -48,7 +48,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(); } @@ -60,7 +60,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(); @@ -82,7 +82,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/static/web/css/admin.css b/src/static/web/css/admin.css index d1aa2ea6..5974a417 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -1 +1 @@ -*{font-size:12px;letter-spacing:.4px}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff}form,h1,h2,h3,ul,ol,div{margin:0;padding:0}td{line-height:1.5}td,th,div{word-break:break-all;word-wrap:break-word}li,dd{margin:0;padding:0;list-style:none}label{display:inline-block;margin:8px 0}input{padding:.25rem .5rem;height:calc(1.6rem + .8rem);color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=radio],input[type=checkbox]{margin:0;height:auto;box-shadow:none;outline:none;vertical-align:text-top}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;color:#fff;background:#009688;border-radius:.2rem;border:0;transition:all .6s}input[type=button]:focus,input[type=submit]:focus,input[type=reset]:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}textarea{padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}input:focus,textarea:focus{border-color:#009688;box-shadow:0 0 2px #009688;outline:none}select{padding:.25rem .5rem;height:calc(1.6rem + .8rem);color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}a:link{color:#424b51;text-decoration:none}a:hover{opacity:.8}a:visited{color:#666}.np{border:0}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f6f6f6;border-bottom:1px solid #ccc;border-radius:.2rem;border:0;cursor:pointer}.coolbg2{height:18px;background:#DFDDD2;border:1px solid #000}.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6}.bline{height:36px;background:#fff;border-bottom:1px solid #eee}#uploadfield{float:left}.bline2{border-bottom:1px solid #eee}.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#E4F7D7;cursor:pointer}.coolbt2{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#F7FCDA}.coolbg3{width:140px;height:20px;border:1px solid #BDC5B4;background:#DFDDD2;text-align:right}.coolbg61{width:380px;height:26px;line-height:26px;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;background:#E7F3B1;text-align:right}.coolbg62{padding:6px;width:380px;height:300px;border:1px solid #BDC5B4;background:#F8FDF0}.coolbg4{width:160px;height:30px;line-height:30px;border-bottom:1px solid #C9CFC1;background:#F9FCDC url(/static/web/img/dlgtitle.gif)repeat-x;text-align:right}.coolbg5{width:160px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC}.wsselect{height:60px;background:#FCFEF1;overflow:auto}.dlg{padding:.25rem .5rem;width:360px;line-height:160%;background:#F0FAEB;border:2px solid #008E38}.pubdlg{background:#fff;border:4px solid #008E38;border-radius:.2rem;z-index:8888}.pubdlg .title{height:30px;line-height:30px;border-bottom:1px solid #C9CFC1;background:url(/static/web/img/dlgtitle.gif)repeat-x;text-align:left;cursor:move}.pubdlg .titLeft{float:left;padding-left:10px;line-height:29px;font-weight:600;color:#424b51}.pubdlg .titRight{float:right;padding:0}.fullpagediv{position:absolute;top:0;left:0;width:100%;height:120%;background:#cdcdcd;opacity:.5;z-index:1999}.quicksel{margin-left:10px;margin-top:10px;width:680px;height:420px;overflow:auto;z-index:10005}.quickselfoot{padding:10px 0;border-top:1px dashed #C0CC9D}.quickselItem{margin-bottom:10px}.quickselItem .topcat{padding-left:10px;border-bottom:1px dashed #ccc;background:#FBFEEF;clear:both}.quickselItem .soncat{padding-left:10px}.quickselItem .item{float:left;margin-right:8px}.mysource,.mywriter{padding:.25rem .5rem;width:280px;line-height:160%;border:4px solid #008E38;background:#F0FAEB;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #008E38;background:#F0FAEB}#_mysource{z-index:10003}#_mywriter{z-index:10004}#uploadwait{z-index:19999}.option1{background:#DCECA6}.option2{background:#F7FBD2}.option3{background:#fff}.ininput{width:96%;height:20px;border:1px solid #fff}.nbt{padding:2px;background:#fff url(/static/web/img/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.divpre img{max-width:150px;max-height:100px}.divpre{overflow:hidden}.autoinput{padding-left:6px;width:90%}.bodytitle{margin:auto;width:98%;height:30px;border:1px dotted #BFD67C;background:url(/static/web/img/wbg.gif)}.bodytitle div{float:left;line-height:30px}.bodytitletxt{padding-left:10px}.tbtitle td{padding:6px}.tblist td{padding:6px;background:#fff}.tblist td.tbsname{padding:6px;background:#F9FFE6}.colordlg{padding:.25rem .5rem;width:100px;line-height:160%;border:2px dashed #008E38;background:#F0FAEB;z-index:10005}option.alltype{padding-left:16px;height:18px;line-height:18px;background:url(/static/web/img/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(/static/web/img/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(/static/web/img/arrr.gif)10px 4px no-repeat}.ilist{border-top:1px dashed #eee;border-bottom:1px dashed #eee;border-left:1px dashed #eee}.ilist td{border-right:1px dashed #eee}#typeid2{float:left;padding:0;height:18px;background:url(/static/web/img/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:80px;height:22px;cursor:pointer;opacity:0}.litpic_span{margin-left:-60px;width:80px;height:22px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate,#uptime{padding-left:30px;background:url(/static/web/img/calendar.gif)10px no-repeat}#title{background:url(/static/web/img/ruler.gif)repeat-x 0px 10px}.spec{width:60px}.gtab a{display:block;float:left;width:80px;height:26px;line-height:26px;text-align:center}.albCt img{cursor:pointer}.m1{border-left:1px solid #DFDFDB;border-top:1px solid #DFDFDB;border-bottom:1px solid #808080}.m2{border-left:1px solid #DFDFDB;border-bottom:1px solid #808080;border-top:1px solid #DFDFDB;border-right:1px solid #DFDFDB}.m3{border-left:1px solid #DFDFDB;border-top:1px solid #DFDFDB;border-right:1px solid #DFDFDB}.article{line-height:160%;table-layout:fixed;word-break:break-all}.bn{color:#fff;line-height:50%}.contents{color:#F7F6F8}.nb{border:1px solid #ccc}.coolbg{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background-color:#E6E6E6}.ctfield{padding:2px;line-height:150%}.nndiv{width:170px;height:20px;margin:0;padding:0;word-break:break-all;overflow:hidden}.maintable{width:98%!important;border:1px solid #dee2e6}span.page-link{color:#fff;background:#009688}a.btn{color:white!important}.btn+.btn{margin-left:10px}.btn-success{background:#009688;border-color:#009688}.table{color:#424b51}.table td,.table th{padding:.6rem;vertical-align:middle}.table th img,.table td img{vertical-align:text-bottom} \ No newline at end of file +*{font-size:12px;letter-spacing:.4px}body{line-height:1.5;font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff}form,h1,h2,h3,ul,ol,div{margin:0;padding:0}td{line-height:1.5}td,th,div{word-break:break-all;word-wrap:break-word}li,dd{margin:0;padding:0;list-style:none}label{display:inline-block;margin:8px 0}input{padding:.25rem .5rem;height:calc(1.6rem + .8rem);color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=radio],input[type=checkbox]{margin:0;height:auto;box-shadow:none;outline:none;vertical-align:text-top}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;color:#fff;background:#009688;border-radius:.2rem;border:0;transition:all .6s}input[type=button]:focus,input[type=submit]:focus,input[type=reset]:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}textarea{padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}input:focus,textarea:focus{border-color:#009688;box-shadow:0 0 2px #009688;outline:none}select{padding:.25rem .5rem;height:calc(1.6rem + .8rem);color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}a:link{color:#424b51;text-decoration:none}a:hover{opacity:.8}a:visited{color:#666}.np{border:0}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f6f6f6;border-bottom:1px solid #ccc;border-radius:.2rem;border:0;cursor:pointer}.coolbg2{height:18px;background:#DFDDD2;border:1px solid #000}.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6}.bline{height:36px;background:#fff;border-bottom:1px solid #eee}#uploadfield{float:left}.bline2{border-bottom:1px solid #eee}.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#E4F7D7;cursor:pointer}.coolbt2{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#F7FCDA}.coolbg3{width:140px;height:20px;border:1px solid #BDC5B4;background:#DFDDD2;text-align:right}.coolbg61{width:380px;height:26px;line-height:26px;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;background:#E7F3B1;text-align:right}.coolbg62{padding:6px;width:380px;height:300px;border:1px solid #BDC5B4;background:#F8FDF0}.coolbg4{width:160px;height:30px;line-height:30px;border-bottom:1px solid #C9CFC1;background:#F9FCDC url(/static/web/img/dlgtitle.gif)repeat-x;text-align:right}.coolbg5{width:160px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC}.wsselect{height:60px;background:#FCFEF1;overflow:auto}.dlg{padding:.25rem .5rem;width:360px;line-height:160%;background:#F0FAEB;border:2px solid #008E38}.pubdlg{background:#fff;border:4px solid #008E38;border-radius:.2rem;z-index:8888}.pubdlg .title{height:30px;line-height:30px;border-bottom:1px solid #C9CFC1;background:url(/static/web/img/dlgtitle.gif)repeat-x;text-align:left;cursor:move}.pubdlg .titLeft{float:left;padding-left:10px;line-height:29px;font-weight:600;color:#424b51}.pubdlg .titRight{float:right;padding:0}.fullpagediv{position:absolute;top:0;left:0;width:100%;height:120%;background:#cdcdcd;opacity:.5;z-index:1999}.quicksel{margin-left:10px;margin-top:10px;width:680px;height:420px;overflow:auto;z-index:10005}.quickselfoot{padding:10px 0;border-top:1px dashed #C0CC9D}.quickselItem{margin-bottom:10px}.quickselItem .topcat{padding-left:10px;border-bottom:1px dashed #ccc;background:#FBFEEF;clear:both}.quickselItem .soncat{padding-left:10px}.quickselItem .item{float:left;margin-right:8px}.mysource,.mywriter{padding:.25rem .5rem;width:280px;line-height:160%;border:4px solid #008E38;background:#F0FAEB;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #008E38;background:#F0FAEB}#_mysource{z-index:10003}#_mywriter{z-index:10004}#uploadwait{z-index:19999}.option1{background:#DCECA6}.option2{background:#F7FBD2}.option3{background:#fff}.ininput{width:96%;height:20px;border:1px solid #fff}.nbt{padding:2px;background:#fff url(/static/web/img/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.divpre img{max-width:150px;max-height:100px}.divpre{overflow:hidden}.autoinput{padding-left:6px;width:90%}.bodytitle{margin:auto;width:98%;height:30px;border:1px dotted #BFD67C;background:url(/static/web/img/wbg.gif)}.bodytitle div{float:left;line-height:30px}.bodytitletxt{padding-left:10px}.tbtitle td{padding:6px}.tblist td{padding:6px;background:#fff}.tblist td.tbsname{padding:6px;background:#F9FFE6}.colordlg{padding:.25rem .5rem;width:100px;line-height:160%;border:2px dashed #008E38;background:#F0FAEB;z-index:10005}option.alltype{padding-left:16px;height:18px;line-height:18px;background:url(/static/web/img/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(/static/web/img/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(/static/web/img/arrr.gif)10px 4px no-repeat}.ilist{border-top:1px dashed #eee;border-bottom:1px dashed #eee;border-left:1px dashed #eee}.ilist td{border-right:1px dashed #eee}#typeid2{float:left;padding:0;height:18px;background:url(/static/web/img/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:80px;height:22px;cursor:pointer;opacity:0}.litpic_span{margin-left:-60px;width:80px;height:22px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate,#uptime{padding-left:30px;background:url(/static/web/img/calendar.gif)10px no-repeat}#title{background:url(/static/web/img/ruler.gif)repeat-x 0px 10px}.spec{width:60px}.gtab a{display:block;float:left;width:80px;height:26px;line-height:26px;text-align:center}.albCt img{cursor:pointer}.m1{border-left:1px solid #DFDFDB;border-top:1px solid #DFDFDB;border-bottom:1px solid #808080}.m2{border-left:1px solid #DFDFDB;border-bottom:1px solid #808080;border-top:1px solid #DFDFDB;border-right:1px solid #DFDFDB}.m3{border-left:1px solid #DFDFDB;border-top:1px solid #DFDFDB;border-right:1px solid #DFDFDB}.article{line-height:160%;table-layout:fixed;word-break:break-all}.bn{color:#fff;line-height:50%}.contents{color:#F7F6F8}.nb{border:1px solid #ccc}.coolbg{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background-color:#E6E6E6}.ctfield{padding:2px;line-height:150%}.nndiv{width:170px;height:20px;margin:0;padding:0;word-break:break-all;overflow:hidden}.maintable{width:98%!important;border:1px solid #dee2e6}span.page-link{color:#fff;background:#009688}a.btn{color:white!important}.btn+.btn{margin-left:10px}.btn-danger{background:#ff5722;border-color:#ff5722}.btn-success{background:#009688;border-color:#009688}.table{color:#424b51}.table td,.table th{padding:.6rem;vertical-align:middle}.table th img,.table td img{vertical-align:text-bottom} \ No newline at end of file diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php index 0be328b0..8ff2dbff 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/common.func.php b/src/system/common.func.php index 01770829..f66b3ed2 100755 --- a/src/system/common.func.php +++ b/src/system/common.func.php @@ -350,7 +350,7 @@ function AddFilter($channelid, $type=1, $fieldsnamef="", $defaulttid=0, $loadtyp $dede_addonfields .= ''.$ctag->GetAtt('itemname').'：'; switch ($type) { case 1: - $dede_addonfields .= (preg_match("/&".$ctag->GetName()."=/is",$filterarr,$regm) ? 'GetName()."=".$fields_value,"",$filterarr).'" style="display:inline-block;padding:.25rem .5rem;line-height:1.5;color:#fff;background:#008e38;border-color:#008e38;border-radius:.2rem">全部' : '全部').' '; + $dede_addonfields .= (preg_match("/&".$ctag->GetName()."=/is",$filterarr,$regm) ? 'GetName()."=".$fields_value,"",$filterarr).'" style="display:inline-block;padding:.25rem .5rem;line-height:1.5;color:#fff;background:#008e38;border-color:#008e38;border-radius:.2rem">全部' : '全部').' '; $addonfields_items = explode(",",$ctag->GetAtt('default')); for ($i=0; $iGetName()."=".$fields_value,$ctag->GetName()."=".$fields_value, "&".$ctag->GetName()."=&"), array("&".$ctag->GetName()."=".$fields_value2,$ctag->GetName()."=".$fields_value2, "&"), $filterarr); $href3 = !end(explode("=", $href3)) ? str_replace("&".end(explode("&", $href3)), "", $href3) : $href3; - $dede_addonfields .= ($fields_value!=urlencode($addonfields_items[$i]) && $is_select!=1 ? ''.$addonfields_items[$i].'' : ''.$addonfields_items[$i].'×')." "; + $dede_addonfields .= ($fields_value!=urlencode($addonfields_items[$i]) && $is_select!=1 ? ''.$addonfields_items[$i].'' : ''.$addonfields_items[$i].'×')." "; } $dede_addonfields .= '

'; break; diff --git a/src/system/database/dedesqli.class.php b/src/system/database/dedesqli.class.php index 5aeaa7e2..f2b7f621 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 76e9a262..20748148 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 6b5e5d11..8df55891 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 a402653c..39814296 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 = ''; } @@ -195,7 +195,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 a54102db..24492be2 100644 --- a/src/theme/plus/car.htm +++ b/src/theme/plus/car.htm @@ -60,7 +60,7 @@ diff --git a/src/user/templets/content_sg_list.htm b/src/user/templets/content_sg_list.htm index 52df7941..d591dd59 100755 --- a/src/user/templets/content_sg_list.htm +++ b/src/user/templets/content_sg_list.htm @@ -72,7 +72,7 @@ diff --git a/src/user/templets/pm-main.htm b/src/user/templets/pm-main.htm index 5f826b0e..a441d63a 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']; ?>
+ 您目前所展开的是系统模型，系统模型一般对发布程序和管理程序已经固化，如果您胡乱修改系统模型将会导致使用这种内容类型的频道可能崩溃
- 下载的文件临时存放在文件夹（../data/）内，如果某些基础类有重要的改动导致更新中途中错，您可以从这文件夹提取文件手工更新 + 下载的文件临时存放在文件夹（../data/）内，如果某些基础类有重要的改动导致更新中途中错，您可以从这文件夹提取文件手工更新
- 共 {dede:var.carts.cart_count/} 件商品,合计: + 共 {dede:var.carts.cart_count/} 件商品,合计: {dede:var.carts.price_count/}元
diff --git a/src/user/config.php b/src/user/config.php index 5989925d..ab254adf 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..0b335c40 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 52f79681..aeb1199b 100755 --- a/src/user/index_do.php +++ b/src/user/index_do.php @@ -96,7 +96,7 @@ else if ($fmdo == 'user') { if ($msg == 'ok') { $msg = "√{$msgtitle}可以使用"; } else { - $msg = "×{$msg}"; + $msg = "×{$msg}"; } echo $msg; exit(); @@ -115,7 +115,7 @@ else if ($fmdo == 'user') { if (!is_array($row)) { $msg = "√可以使用"; } else { - $msg = "×Email已经被另一个帐号占用"; + $msg = "×Email已经被另一个帐号占用"; } } } diff --git a/src/user/templets/content_list.htm b/src/user/templets/content_list.htm index 92941acf..f60810bf 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 "未审核"; ?> =0) echo "已审核"; else if($fields['arcrank']==-2) echo "被退回"; - else echo "未审核"; + else echo "未审核"; ?>
未阅读" : '已阅读'); + $readmsg = ($fields['hasview']==0 ? "未阅读" : '已阅读'); echo $readmsg; ?>