diff --git a/src/admin/actionsearch_class.php b/src/admin/actionsearch_class.php index e55bea1c..dafb4eb0 100644 --- a/src/admin/actionsearch_class.php +++ b/src/admin/actionsearch_class.php @@ -79,11 +79,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/archives_do.php b/src/admin/archives_do.php index a11540fd..e86b30d7 100644 --- a/src/admin/archives_do.php +++ b/src/admin/archives_do.php @@ -316,11 +316,11 @@ else if ($dopost == 'moveArchives') { echo ""; echo ""; ?> - + - +
 目标栏目：
 文档ID： @@ -521,7 +521,7 @@ else if ($dopost == 'quickEdit') { echo ""; echo ""; ?> - + - + - + - + - + - + @@ -838,7 +838,7 @@ else if ($dopost == 'attsDlg') { echo ""; echo "
 所属栏目：
 属性： '> @@ -550,15 +550,15 @@ else if ($dopost == 'quickEdit') { ?>
 标题：
 简略标题：
 阅读权限： " style="width:100px">
 关键字：
"; ?> - + - + diff --git a/src/admin/article_keywords_select.php b/src/admin/article_keywords_select.php index 39ece3f9..d0503276 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 b82681ba..6a14646d 100644 --- a/src/admin/article_template_rand.php +++ b/src/admin/article_template_rand.php @@ -95,7 +95,7 @@ function DoRand(jobname)
 属性： '> @@ -852,7 +852,7 @@ else if ($dopost == 'attsDlg') { ?>
 文档ID：
- - + diff --git a/src/admin/css/base.css b/src/admin/css/base.css index 08b419b1..f0db35d6 100644 --- a/src/admin/css/base.css +++ b/src/admin/css/base.css @@ -1 +1 @@ -*{font-size:12px;letter-spacing:.4px}body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;line-height:1.5}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}b,strong{font-weight:400}li,dd{margin:0;padding:0;list-style-type:none}label{display:inline-block;margin:10px 0}input{padding:.25rem .5rem;height:calc(1.5em + .75rem + 2px);line-height:18px;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=radio],input[type=checkbox]{height:auto;box-shadow:none;outline:none}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;line-height:1.5;color:#fff;background:#28a745;border-radius:.2rem;transition:all .6s;border:0}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)}input:focus,textarea:focus{border-color:#28a745;box-shadow:0 0 2px #28a745;outline:none}textarea{padding:.25rem .5rem;line-height:18px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}select{height:calc(1.5em + .75rem + 2px);padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}h1,h2,h3{font-size:18px;color:#424b51}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:#f2f2f2;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:190px;height:24px;line-height:24px;border-bottom:1px solid #C9CFC1;background:#F9FCDC url(../images/dlgtitle.gif)repeat-x;text-align:right}.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC}.wsselect{height:60px;line-height:24px;background:#FCFEF1;overflow:auto}.dlg{padding:.25rem .5rem;border:2px solid #008E38;background:#F0FAEB;width:360px;line-height:160%}.pubdlg{background:#fff;border:4px solid #008E38;border-radius:.2rem;z-index:8888}.pubdlg .title{height:29px;line-height:29px;border-bottom:1px solid #C9CFC1;background:url(../images/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-top:8px;border-top:1px dashed #C0CC9D}.quickselItem{margin-bottom:8px}.quickselItem .topcat{padding-left:6px;line-height:24px;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(../images/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.waitpage{position:absolute;top:0;left:0;opacity:.7;background:#ababab url(../../images/loading1.gif)center no-repeat;z-index:10000}.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(../images/wbg.gif)}.bodytitle div{float:left}.bodytitletxt{padding-left:6px;line-height:28px}.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(../images/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(../images/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{padding:0;float:left;height:18px;font-size:12px;background:url(../images/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:85px;height:20px;opacity:0;cursor:pointer}.litpic_span{margin-left:-60px;width:76px;height:22px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate,#uptime{padding-left:30px;background:url(../images/calendar.gif)10px no-repeat}#title{background:url(../images/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}.maintable{width:98%!important;border:1px solid #dee2e6}span.page-link{color:#fff;background:#28a745}a.btn{color:white!important}.btn-success{background:#28a745;border-color:#28a745}.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{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;line-height:1.5}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}b,strong{font-weight:400}li,dd{margin:0;padding:0;list-style-type:none}label{display:inline-block;margin:10px 0}input{padding:.25rem .5rem;height:calc(1.5em + .75rem + 2px);line-height:18px;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=radio],input[type=checkbox]{height:auto;box-shadow:none;outline:none}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;line-height:1.5;color:#fff;background:#dc3545color:#dc3545;border-radius:.2rem;transition:all .6s;border:0}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)}input:focus,textarea:focus{border-color:color:#dc3545;box-shadow:0 0 2px color:#dc3545;outline:none}textarea{padding:.25rem .5rem;line-height:18px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}select{height:calc(1.5em + .75rem + 2px);padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}h1,h2,h3{font-size:18px;color:#424b51}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:#f2f2f2;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:190px;height:24px;line-height:24px;border-bottom:1px solid #C9CFC1;background:#F9FCDC url(../images/dlgtitle.gif)repeat-x;text-align:right}.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC}.wsselect{height:60px;line-height:24px;background:#FCFEF1;overflow:auto}.dlg{padding:.25rem .5rem;border:2px solid #008E38;background:#F0FAEB;width:360px;line-height:160%}.pubdlg{background:#fff;border:4px solid #008E38;border-radius:.2rem;z-index:8888}.pubdlg .title{height:29px;line-height:29px;border-bottom:1px solid #C9CFC1;background:url(../images/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-top:8px;border-top:1px dashed #C0CC9D}.quickselItem{margin-bottom:8px}.quickselItem .topcat{padding-left:6px;line-height:24px;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(../images/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.waitpage{position:absolute;top:0;left:0;opacity:.7;background:#ababab url(../../images/loading1.gif)center no-repeat;z-index:10000}.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(../images/wbg.gif)}.bodytitle div{float:left}.bodytitletxt{padding-left:6px;line-height:28px}.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(../images/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(../images/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{padding:0;float:left;height:18px;font-size:12px;background:url(../images/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:85px;height:20px;opacity:0;cursor:pointer}.litpic_span{margin-left:-60px;width:76px;height:22px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate,#uptime{padding-left:30px;background:url(../images/calendar.gif)10px no-repeat}#title{background:url(../images/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}.maintable{width:98%!important;border:1px solid #dee2e6}span.page-link{color:#fff;background:#dc3545color:#dc3545}a.btn{color:white!important}.btn-success{background:#dc3545color:#dc3545;border-color:color:#dc3545}.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/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php index 6ddbf59e..81de57d9 100644 --- a/src/admin/dialog/select_mimages.php +++ b/src/admin/dialog/select_mimages.php @@ -18,7 +18,7 @@ ul{margin:0;padding:0;list-style:none} button+button{margin-left:10px} #wrap{padding:10px} #topbar{padding:10px 0;border-bottom:1px solid #ccc;text-align:right} -#topbar button{display:inline-block;border:0;padding:.25rem .5rem;line-height:1.5;font-size:12px;color:#fff;background:#28a745;border-color:#28a745;border-radius:.25rem;transition:all .6s;text-align:center} +#topbar button{display:inline-block;border:0;padding:.25rem .5rem;line-height:1.5;font-size:12px;color:#fff;background:#dc3545color:#dc3545;border-color:color:#dc3545;border-radius:.25rem;transition:all .6s;text-align:center} .topbar button+.topbar button{margin-left:10px} #topbar button:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5);outline:none} #file_list{display:grid;grid-gap:10px;grid-template-columns:repeat(auto-fill,minmax(160px,1fr));padding-top:10px} diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index 355a31f9..07c7e866 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -120,7 +120,7 @@ table{background:#fff} else if ($file == "..") { if ($activepath == "") continue; $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath); - $line = " + $line = "\r\n"; @@ -128,7 +128,7 @@ table{background:#fff} } else if (is_dir("$inpath/$file")) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; - $line = " + $line = " @@ -140,7 +140,7 @@ table{background:#fff} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - $line = " + $line = " @@ -152,7 +152,7 @@ table{background:#fff} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - $line = " + $line = " diff --git a/src/admin/diy_add.php b/src/admin/diy_add.php index 5f5e21fe..0c37396d 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 b9130b36..e398ea20 100644 --- a/src/admin/feedback_edit.php +++ b/src/admin/feedback_edit.php @@ -23,7 +23,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 8add72b0..5e68c848 100644 --- a/src/admin/feedback_main.php +++ b/src/admin/feedback_main.php @@ -18,7 +18,7 @@ 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/file_class.php b/src/admin/file_class.php index 601da04a..d5b6668c 100644 --- a/src/admin/file_class.php +++ b/src/admin/file_class.php @@ -1,5 +1,5 @@
+ 如果您想对旧的文章应用随机模板设置，请点击此对旧文章进行处理(必须设置好模板项)   设置全部   取消全部 diff --git a/src/admin/catalog_del.php b/src/admin/catalog_del.php index 0ac08eed..0fc23ef8 100644 --- a/src/admin/catalog_del.php +++ b/src/admin/catalog_del.php @@ -34,7 +34,7 @@ $win = new OxWindow(); $win->Init('catalog_del.php', 'js/blank.js', 'POST'); $win->AddHidden('id', $id); $win->AddHidden('dopost', 'ok'); -$win->AddTitle("您要确实要删除栏目： [{$row['typename']}] 吗？"); +$win->AddTitle("您要确实要删除栏目：[{$row['typename']}] 吗？"); $win->AddItem('栏目的文件保存目录：', $row['typedir']); $win->AddItem('是否删除文件：', " "); $winform = $win->GetWindow('ok'); diff --git a/src/admin/catalog_do.php b/src/admin/catalog_do.php index 95c7ec6e..ec0e20fc 100644 --- a/src/admin/catalog_do.php +++ b/src/admin/catalog_do.php @@ -210,7 +210,7 @@ function unitCatalog() { } $reid = $tl->TypeInfos['reid']; $channelid = $tl->TypeInfos['channeltype']; if (!empty($row['dd'])) { - ShowMsg("栏目： $typename($typeid) 有子栏目，不能进行合并操作", '-1'); + ShowMsg("栏目：$typename($typeid) 有子栏目，不能进行合并操作", '-1'); exit(); } $typeOptions = $tl->GetOptionArray(0, 0, $channelid); @@ -223,7 +223,7 @@ function 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/catalog_edit.php b/src/admin/catalog_edit.php index e60677e4..92ba8d01 100644 --- a/src/admin/catalog_edit.php +++ b/src/admin/catalog_edit.php @@ -187,7 +187,7 @@ if ($dopost == 'time') {
排列顺序： 排列顺序： （由低 -> 高）
上级目录 当前目录：$activepath
$file
$file $filesize KB $filetime
$file $filesize KB $filetime
- diff --git a/src/admin/mail_title_send.php b/src/admin/mail_title_send.php index 1ec8b668..4c790fc9 100644 --- a/src/admin/mail_title_send.php +++ b/src/admin/mail_title_send.php @@ -60,12 +60,12 @@ if($dopost=="send"){ }else{ function GetState($state){ - if($state=="0") return "未发送"; + if($state=="0") return "未发送"; else return "已发送"; } function GetSendTimeMk($mktime){ - if($mktime=="0") return "未发送"; + if($mktime=="0") return "未发送"; else return MyDate('Y-m-d H:i:s',$mktime); } diff --git a/src/admin/mda_main.php b/src/admin/mda_main.php index 19f104e5..9abf7897 100644 --- a/src/admin/mda_main.php +++ b/src/admin/mda_main.php @@ -120,7 +120,7 @@ if ($dopost == 'place' or $dopost == 'report' or $dopost == 'account' or $dopost
+
修改快捷操作项
@@ -146,25 +146,25 @@ else if ($dopost == 'getRightSide') { ?> - + - + - + - +
会员数： 会员数：
文档数： 文档数：
： ：  
评论数： 评论数：
@@ -188,7 +188,7 @@ exit(); $row['editcon'] = 'archives_edit.php'; } $linkstr = "·{$row['title']}"; - if ($row['arcrank'] == -1) $linkstr .= "(未审核)"; + if ($row['arcrank'] == -1) $linkstr .= "(未审核)"; ?>
- + {$addstr} @@ -367,7 +367,7 @@ function __index(){ }
{$ptitle}{$ptitle}
- +
德得广告德得广告
@@ -412,7 +412,7 @@ function __index(){ }
- + diff --git a/src/admin/member_do.php b/src/admin/member_do.php index 04b17434..222c3cda 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(); } @@ -146,7 +146,7 @@ function __EditUser() 修改会员 ----------------*/ else if ($dopost == 'edituser') { CheckPurview('member_Edit'); - if (!isset($_POST['id'])) exit('Request Error!'); + if (!isset($_POST['id'])) exit('dedebiz'); $pwdsql = empty($pwd) ? '' : ",pwd='".md5($pwd)."'"; if (empty($sex)) $sex = '男'; $uptime = GetMkTime($uptime); diff --git a/src/admin/member_main.php b/src/admin/member_main.php index 4da836e7..81b42b03 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 a85e8431..e106187d 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 82069f99..ee442660 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -141,7 +141,7 @@ else if ($action == 'setup') { $prvdir .= "\r\n"; foreach ($prvdirs as $k => $v) { if ($v) $cw = '√'; - else $cw = '×'; + else $cw = '×'; $prvdir .= ""; $prvdir .= "\r\n"; } @@ -149,33 +149,33 @@ else if ($action == 'setup') { $win = new OxWindow(); $win->Init("module_main.php", "js/blank.js", "post"); $wecome_info = "模块管理"; - $win->AddTitle(" 模块管理 >> 安装模块： {$infos['name']}"); + $win->AddTitle(" 模块管理 >> 安装模块：{$infos['name']}"); $win->AddHidden("hash", $hash); $win->AddHidden("action", 'setupstart'); $msg = "
目录可写
$k$cw
- + - + - + - + - + - + @@ -197,7 +197,7 @@ else if ($action == 'setup') { - +
模块名称：模块名称： {$infos['name']}
语言：语言： {$infos['lang']} {$alertMsg}
文件大小：文件大小： {$infos['filesize']}
开发者ID：开发者ID： {$infos['dev_id']} 未认证
发布时间：发布时间： {$infos['time']}
使用协议：使用协议： 浏览
对于已存在文件处理方法：对于已存在文件处理方法： @@ -284,37 +284,37 @@ else if ($action == 'del') { $win = new OxWindow(); $win->Init("module_main.php", "js/blank.js", "post"); $wecome_info = "模块管理"; - $win->AddTitle("模块管理 >> 删除模块： {$infos['name']}"); + $win->AddTitle("模块管理 >> 删除模块：{$infos['name']}"); $win->AddHidden('hash', $hash); $win->AddHidden('action', 'delok'); $msg = " - + - + - + - + - + - + - +
模块名称：模块名称： {$infos['name']}
语言：语言： {$infos['lang']} {$alertMsg}
文件大小：文件大小： {$infos['filesize']}
开发者ID：开发者ID： {$dev_id}
发布时间：发布时间： {$infos['time']}
使用协议：使用协议： 浏览
删除模块仅删除这个模块的安装包文件，如果您已经安装，请执行卸载程序来删除。删除模块仅删除这个模块的安装包文件，如果您已经安装，请执行卸载程序来删除。
"; $win->AddMsgItem("
$msg
"); @@ -349,37 +349,37 @@ else if ($action == 'uninstall') { $win = new OxWindow(); $win->Init("module_main.php", "js/blank.js", "post"); $wecome_info = "模块管理"; - $win->AddTitle("模块管理 >> 卸载模块： {$infos['name']}"); + $win->AddTitle("模块管理 >> 卸载模块：{$infos['name']}"); $win->AddHidden("hash", $hash); $win->AddHidden("action", 'uninstallok'); $msg = " - + - + - + - + - + - + - + - +
模块名称：模块名称： {$infos['name']}
语言：语言： {$infos['lang']} {$alertMsg}
文件大小：文件大小： {$infos['filesize']}
开发者ID：开发者ID： {$dev_id}
发布时间：发布时间： {$infos['time']}
使用协议：使用协议： 浏览
模块包含的文件：
（文件路径相对于当前目录）		 模块包含的文件：
（文件路径相对于当前目录）		 
@@ -387,7 +387,7 @@ else if ($action == 'uninstall') {
对于模块的文件处理方法：对于模块的文件处理方法： @@ -481,35 +481,35 @@ else if ($action == 'view') { $win = new OxWindow(); $win->Init("", "js/blank.js", ""); $wecome_info = "模块管理"; - $win->AddTitle("模块管理 >> 模块详情： {$infos['name']}"); + $win->AddTitle("模块管理 >> 模块详情：{$infos['name']}"); $msg = " - + - + - + - + - + - + - +
模块名称：模块名称： {$infos['name']}
语言：语言： {$infos['lang']} {$alertMsg}
文件大小：文件大小： {$infos['filesize']}
开发者ID：开发者ID： {$dev_id}
发布时间：发布时间： {$infos['time']}
使用协议：使用协议： 浏览
模块包含的文件：
（文件路径相对于当前目录）		 模块包含的文件：
（文件路径相对于当前目录）		 
diff --git a/src/admin/module_upload.php b/src/admin/module_upload.php index 36a0f230..d3e7520f 100644 --- a/src/admin/module_upload.php +++ b/src/admin/module_upload.php @@ -81,13 +81,13 @@ if ($action == 'upload') { $win->AddHidden("action", 'upload'); $msg = " - + - + diff --git a/src/admin/mychannel_add.php b/src/admin/mychannel_add.php index 9377acaa..18609dbc 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 3704fb69..ebbab012 100644 --- a/src/admin/mychannel_edit.php +++ b/src/admin/mychannel_edit.php @@ -56,7 +56,7 @@ function __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'); @@ -539,9 +539,9 @@ function __modifysearch() } else if ($mainfield == 'iscommend') { $forms .= "
"; } else if ($mainfield == 'writer') { - $forms .= "作者：
"; + $forms .= "作者：
"; } else if ($mainfield == 'source') { - $forms .= "来源：
"; + $forms .= "来源：
"; } else if ($mainfield == 'senddate') { $forms .= "开始时间：
"; $forms .= "结束时间：
"; diff --git a/src/admin/public_guide.php b/src/admin/public_guide.php index bfd9d37b..cca93cf5 100644 --- a/src/admin/public_guide.php +++ b/src/admin/public_guide.php @@ -30,13 +30,13 @@ if ($action == 'setdefault') { $msg = " 成功取消默认发布表单
- 您目前想要进行的操作： 返回发布向导页 + 您目前想要进行的操作：返回发布向导页 "; } else { $msg = " 成功保存默认发布表单，以后点击“内容发布”面板将直接跳转到您选择的内容发布页
- 您目前想要进行的操作： 转到默认发布表单   返回发布向导页 + 您目前想要进行的操作：转到默认发布表单   返回发布向导页 "; } $win->AddMsgItem("
$msg
"); diff --git a/src/admin/shops_operations_cart.php b/src/admin/shops_operations_cart.php index 9dfc7d7b..4cdec6b4 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 39c0865d..efefc850 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_admin_user_tj.php b/src/admin/sys_admin_user_tj.php index 5412fd98..526a875b 100644 --- a/src/admin/sys_admin_user_tj.php +++ b/src/admin/sys_admin_user_tj.php @@ -102,7 +102,7 @@ if (isset($dopost) && $dopost == 'getone') { $msg = "
文件格式：文件格式：
已有模块：已有模块：
- + @@ -110,7 +110,7 @@ if (isset($dopost) && $dopost == 'getone') { - + diff --git a/src/admin/sys_data.php b/src/admin/sys_data.php index e44cad18..70937b7e 100644 --- a/src/admin/sys_data.php +++ b/src/admin/sys_data.php @@ -39,9 +39,9 @@ if ($dopost == "viewinfo") //查看表结构 } else { $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$tablename` "); if ($rs) { - echo "执行优化表： $tablename OK"; + echo "执行优化表：$tablename OK"; } else { - echo "执行优化表： $tablename 失败，原因是：".$dsql->GetError(); + echo "执行优化表：$tablename 失败，原因是：".$dsql->GetError(); } } echo ''; @@ -54,9 +54,9 @@ if ($dopost == "viewinfo") //查看表结构 } else { $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `$tablename` "); if ($rs) { - echo "修复表： $tablename OK"; + echo "修复表：$tablename OK"; } else { - echo "修复表： $tablename 失败，原因是：".$dsql->GetError(); + echo "修复表：$tablename 失败，原因是：".$dsql->GetError(); } } echo ''; diff --git a/src/admin/sys_info.php b/src/admin/sys_info.php index b8701c0c..535fb205 100644 --- a/src/admin/sys_info.php +++ b/src/admin/sys_info.php @@ -110,11 +110,11 @@ EOT; while ($row = $dsql->GetArray()) { $bgcolor = ($i++ % 2 == 0) ? "#F9FCEF" : "#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/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index 641693e4..7b1647bd 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -357,7 +357,7 @@ function CheckCross() { '> - + - + - + - + - + diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index 2e052a08..b00b7e7c 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -286,7 +286,7 @@ function CheckCross() { '> - +
管理员↓|统计信息→管理员↓|统计信息→ 全部(文档|点击) 季度 当月当天
{$userid}{$userid} {$dd} | {$cc} {$dds} | {$ccs} {$ddm} | {$ccm}
： ：
- 已完成数据结构完整性检测 + 已完成数据结构完整性检测

如果您系统有下面几种问题之一，请检测微表正确性：
@@ -84,7 +84,7 @@ function 2_test_arctiny() { } $allarcnum = 0; $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__archives` "); $allarcnum = $arcnum = $row['dd']; - $msg .= "·#@__archives 表总记录数： {$arcnum}
"; + $msg .= "·#@__archives 表总记录数：{$arcnum}
"; $shtables = array(); $dsql->Execute('me', " SELECT addtable FROM `#@__channeltype` WHERE id < -1 "); @@ -96,21 +96,21 @@ function 2_test_arctiny() { } if (!isset($shtables[$addtable])) { $shtables[$addtable] = 1; $row = $dsql->GetOne("SELECT COUNT(aid) AS dd FROM `$addtable` "); - $msg .= "·{$addtable} 表总记录数： {$row['dd']}
"; + $msg .= "·{$addtable} 表总记录数：{$row['dd']}
"; $allarcnum += $row['dd']; } } } - $msg .= "※总有效记录数： {$allarcnum}
"; + $msg .= "※总有效记录数：{$allarcnum}
"; $errall = "完成修正或无错误返回>>"; $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny` "); - $msg .= "※微统计表记录数： {$row['dd']}
"; + $msg .= "※微统计表记录数：{$row['dd']}
"; if ($row['dd'] == $allarcnum) { $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` "; diff --git a/src/admin/sys_safetest.php b/src/admin/sys_safetest.php index 3ade9fa5..11f72219 100644 --- a/src/admin/sys_safetest.php +++ b/src/admin/sys_safetest.php @@ -90,7 +90,7 @@ if ($action == 'test') { AjaxHead(); TestSafe(DEDEROOT); - if ($message == '') $message = "没发现可疑文件"; + if ($message == '') $message = "没发现可疑文件"; echo $message; exit(); } else if ($action == 'viewdiff') { @@ -131,7 +131,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 71e968d0..36dc8665 100644 --- a/src/admin/sys_sql_query.php +++ b/src/admin/sys_sql_query.php @@ -33,8 +33,8 @@ else if ($dopost == "opimize") { echo "没有指定表名"; } else { $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$tablename` "); - if ($rs) echo "执行优化表： $tablename OK"; - else echo "执行优化表： $tablename 失败，原因是：".$dsql->GetError(); + if ($rs) echo "执行优化表：$tablename OK"; + else echo "执行优化表：$tablename 失败，原因是：".$dsql->GetError(); } exit(); } @@ -60,8 +60,8 @@ else if ($dopost == "repair") { echo "没有指定表名"; } else { $rs = $dsql->ExecuteNoneQuery("REPAIR TABLE `$tablename` "); - if ($rs) echo "修复表： $tablename OK"; - else echo "修复表： $tablename 失败，原因是：".$dsql->GetError(); + if ($rs) echo "修复表：$tablename OK"; + else echo "修复表：$tablename 失败，原因是：".$dsql->GetError(); } exit(); } @@ -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/templets/action_search.htm b/src/admin/templets/action_search.htm index 9b56867e..c486b373 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/ad_main.htm b/src/admin/templets/ad_main.htm index 3e8ff9aa..d4aeeb44 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -33,7 +33,7 @@ 关键字： 关键字： diff --git a/src/admin/templets/cards_type.htm b/src/admin/templets/cards_type.htm index 32dbff0c..c362c083 100644 --- a/src/admin/templets/cards_type.htm +++ b/src/admin/templets/cards_type.htm @@ -14,7 +14,7 @@
 点卡产品分类：  点卡产品分类：
产品名称
绑定小分类：
仅适用[分类信息模型]		绑定小分类：
仅适用[分类信息模型]
内容模型：   内容模型： 
默认页的名称： 默认页的名称：
绑定小分类：
仅适用[分类信息模型]		绑定小分类：
仅适用[分类信息模型]		 - +
进行状态： 进行状态：