diff --git a/src/admin/article_template_rand.php b/src/admin/article_template_rand.php index 7a3b619e..b82681ba 100644 --- a/src/admin/article_template_rand.php +++ b/src/admin/article_template_rand.php @@ -99,7 +99,7 @@ function DoRand(jobname) 如果您想对旧的文章应用随机模板设置,请点击此对旧文章进行处理(必须设置好模板项)   设置全部   取消全部 -   $okmsg +   $okmsg diff --git a/src/admin/article_test_title.php b/src/admin/article_test_title.php index c3c98200..88b1d4e1 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/css/albumupload.css b/src/admin/css/albumupload.css index 70f2cae4..757ecd2f 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:red;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:#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 diff --git a/src/admin/css/indexbody.css b/src/admin/css/indexbody.css index 4205d95e..ed2b0a92 100644 --- a/src/admin/css/indexbody.css +++ b/src/admin/css/indexbody.css @@ -1 +1 @@ -.title{color:#666600;font-weight:bold}.title span{padding-left:3px}#addTab{position:absolute;left:455px;top:150px;width:360px;height:200px;z-index:2;background-color:#FFFFFF;border:1px solid #889D8F;padding:0px;display:none;overflow:hidden}#editTab{position:absolute;left:455px;top:120px;width:360px;height:350px;z-index:1;background-color:#FFFFFF;border:1px solid #889D8F;padding:0px;display:none}.txt{float:left}.updatedvt{width:98%;border-bottom:1px dashed #dcdcdc}.upinfotitle{border-bottom:1px solid #cccccc;color:red;font-weight:bold}.verline{border-bottom:1px dashed #cccccc}.itemTable{background:#CBD8AC}#loaddiv{top:0;left:0;background:#cccccc;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-color:rgb(239,248,229)}.dbox dt.rside{border-bottom:1px solid #DEEAB6;background:url(../images/wbg.gif)repeat-x}.dbox dd{padding:0px}.dbox dd.intable{padding-top:0}#updatetest{padding:6px;padding-left:110px;background:url(../images/ico_spider.gif)no-repeat scroll 10px 15px transparent}#quickmenu{width:100%;height:46px;overflow:hidden}#quickmenu .icoitem{float:left;height:24px;line-height:24px;margin-top:10px;padding-left:30px;overflow:hidden}.dboxtable td.nline{border-bottom:1px dashed #CFD7C4;height:26px}.dboxtable1 ul li{float:left;border-bottom:1px dashed #CFD7C4;height:26px;line-height:26px;display:inline;width:48%;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:#666600;font-weight:bold}.title span{padding-left:3px}#addTab{position:absolute;left:455px;top:150px;width:360px;height:200px;z-index:2;background-color:#FFFFFF;border:1px solid #889D8F;padding:0px;display:none;overflow:hidden}#editTab{position:absolute;left:455px;top:120px;width:360px;height:350px;z-index:1;background-color:#FFFFFF;border:1px solid #889D8F;padding:0px;display:none}.txt{float:left}.updatedvt{width:98%;border-bottom:1px dashed #dcdcdc}.upinfotitle{border-bottom:1px solid #cccccc;color:#dc3545;font-weight:bold}.verline{border-bottom:1px dashed #cccccc}.itemTable{background:#CBD8AC}#loaddiv{top:0;left:0;background:#cccccc;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-color:rgb(239,248,229)}.dbox dt.rside{border-bottom:1px solid #DEEAB6;background:url(../images/wbg.gif)repeat-x}.dbox dd{padding:0px}.dbox dd.intable{padding-top:0}#updatetest{padding:6px;padding-left:110px;background:url(../images/ico_spider.gif)no-repeat scroll 10px 15px transparent}#quickmenu{width:100%;height:46px;overflow:hidden}#quickmenu .icoitem{float:left;height:24px;line-height:24px;margin-top:10px;padding-left:30px;overflow:hidden}.dboxtable td.nline{border-bottom:1px dashed #CFD7C4;height:26px}.dboxtable1 ul li{float:left;border-bottom:1px dashed #CFD7C4;height:26px;line-height:26px;display:inline;width:48%;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 a882d140..6f2bfaed 100644 --- a/src/admin/dialog/select_images.php +++ b/src/admin/dialog/select_images.php @@ -196,7 +196,7 @@ table{background:#fff} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; else $lstyle = ""; $line = " @@ -209,7 +209,7 @@ table{background:#fff} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; else $lstyle = ""; $line = " diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php index 641da909..fdd6b400 100644 --- a/src/admin/dialog/select_media.php +++ b/src/admin/dialog/select_media.php @@ -133,7 +133,7 @@ table{background:#fff} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; else $lstyle = ""; $line = " $file @@ -145,7 +145,7 @@ table{background:#fff} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; else $lstyle = ""; $line = " $file @@ -157,7 +157,7 @@ table{background:#fff} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; else $lstyle = ""; $line = " $file @@ -169,7 +169,7 @@ table{background:#fff} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; else $lstyle = ""; $line = " $file diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index 1a7bcb35..355a31f9 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -135,7 +135,7 @@ table{background:#fff} "; echo "$line"; } else if (preg_match("#\.(zip|rar|tgr.gz)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); @@ -147,7 +147,7 @@ table{background:#fff} "; echo "$line"; } else { - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; 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 6ad444e6..52589cfa 100644 --- a/src/admin/dialog/select_templets.php +++ b/src/admin/dialog/select_templets.php @@ -116,7 +116,7 @@ table{background:#fff} "; echo "$line"; } else if (preg_match("#\.(htm|html)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); @@ -128,7 +128,7 @@ table{background:#fff} "; echo "$line"; } else if (preg_match("#\.(css)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); @@ -140,7 +140,7 @@ table{background:#fff} "; echo "$line"; } else if (preg_match("#\.(js)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); @@ -152,7 +152,7 @@ table{background:#fff} "; echo "$line"; } else if (preg_match("#\.(jpg)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); @@ -164,7 +164,7 @@ table{background:#fff} "; echo "$line"; } else if (preg_match("#\.(gif|png)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); @@ -176,7 +176,7 @@ table{background:#fff} "; echo "$line"; } else if (preg_match("#\.(txt)#i", $file)) { - if ($file == $comeback) $lstyle = " style='color:red' "; + if ($file == $comeback) $lstyle = " style='color:#dc3545' "; else $lstyle = ""; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php index c8eea271..f0459c70 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -126,7 +126,7 @@ function 2_test_arctiny() { } if ($row['dd'] == $allarcnum) { $msg .= "

修正记录成功


"; } else { - $msg .= "

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


"; + $msg .= "

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


"; $errall = " 进行高级结合性检测>> "; } } diff --git a/src/admin/tag_test_action.php b/src/admin/tag_test_action.php index f38f0a0f..0f06f301 100644 --- a/src/admin/tag_test_action.php +++ b/src/admin/tag_test_action.php @@ -27,7 +27,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(); diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm index 56b40795..00954a35 100644 --- a/src/admin/templets/mychannel_edit.htm +++ b/src/admin/templets/mychannel_edit.htm @@ -102,7 +102,7 @@ { ?> - + 您目前所展开的是系统模型,系统模型一般对发布程序和管理程序已经固化,如果您胡乱修改系统模型将会导致使用这种内容类型的频道可能崩溃。
- 订单总计: {dede:field.priceCount/}元, {dede:pagelist listsize=3/} + 订单总计: {dede:field.priceCount/}元, {dede:pagelist listsize=3/}
diff --git a/src/include/arc.searchview.class.php b/src/include/arc.searchview.class.php index d6667888..7ea87531 100755 --- a/src/include/arc.searchview.class.php +++ b/src/include/arc.searchview.class.php @@ -296,7 +296,7 @@ class SearchView $this->dsql->Execute('l'); while ($row = $this->dsql->GetArray('l')) { if ($row['count'] > 1000) { - $fstyle = " style='font-size:11pt;color:red'"; + $fstyle = " style='font-size:11pt;color:#dc3545'"; } else if ($row['count'] > 300) { $fstyle = " style='font-size:10pt;color:green'"; } else { diff --git a/src/include/dedesqli.class.php b/src/include/dedesqli.class.php index 50fb5a24..71395445 100755 --- a/src/include/dedesqli.class.php +++ b/src/include/dedesqli.class.php @@ -542,7 +542,7 @@ EOT; if ($this->showError) { $emsg = ''; $emsg .= "

DedeBIZ Error Warning!

\r\n"; - $emsg .= "
Technical Support: https://www.dedebiz.com
"; + $emsg .= "
Technical Support: https://www.dedebiz.com
"; $emsg .= "
\r\n"; $emsg .= "

Error page: ".$this->GetCurUrl()."
\r\n"; $emsg .= "
Error infos: {$msg}
\r\n"; diff --git a/src/include/dedesqlite.class.php b/src/include/dedesqlite.class.php index 7a3203b9..9279a088 100755 --- a/src/include/dedesqlite.class.php +++ b/src/include/dedesqlite.class.php @@ -558,7 +558,7 @@ EOT; if ($this->showError) { $emsg = ''; $emsg .= "

DedeBIZ Error Warning!

\r\n"; - $emsg .= ""; + $emsg .= ""; $emsg .= "
\r\n"; $emsg .= "

Error page: " . $this->GetCurUrl() . "
\r\n"; $emsg .= "
Error infos: {$msg}
\r\n"; diff --git a/src/member/config.php b/src/member/config.php index 6c225200..25df6042 100755 --- a/src/member/config.php +++ b/src/member/config.php @@ -199,10 +199,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/member/templets/pm-main.htm b/src/member/templets/pm-main.htm index d23599da..d611b2e7 100755 --- a/src/member/templets/pm-main.htm +++ b/src/member/templets/pm-main.htm @@ -96,7 +96,7 @@
未阅读" : '已阅读'); + $readmsg = ($fields['hasview']==0 ? "未阅读" : '已阅读'); echo $readmsg; ?>
diff --git a/src/uploads/220222/1-220222222T3E1.png b/src/uploads/220222/1-220222222T3E1.png deleted file mode 100644 index 467cb10a..00000000 Binary files a/src/uploads/220222/1-220222222T3E1.png and /dev/null differ