diff --git a/src/admin/article_coonepage_rule.php b/src/admin/article_coonepage_rule.php index 848ab815..cf3cf0a9 100644 --- a/src/admin/article_coonepage_rule.php +++ b/src/admin/article_coonepage_rule.php @@ -58,7 +58,7 @@ else if ($action == 'editload') { 网站名称： - + 原内容编码： diff --git a/src/admin/article_template_rand.php b/src/admin/article_template_rand.php index 26e571b3..1c9131eb 100644 --- a/src/admin/article_template_rand.php +++ b/src/admin/article_template_rand.php @@ -88,7 +88,7 @@ function DoRand(jobname) } @@ -100,7 +100,7 @@ function DoRand(jobname) - + diff --git a/src/admin/css/indexbody.css b/src/admin/css/indexbody.css index 4dabfedf..3ebf5476 100644 --- a/src/admin/css/indexbody.css +++ b/src/admin/css/indexbody.css @@ -1 +1 @@ -.title{color:#666600}.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(../images/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}#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{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:#28a745}.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(../images/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}#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{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/index_body.php b/src/admin/index_body.php index 0f19f7d6..0177aba1 100644 --- a/src/admin/index_body.php +++ b/src/admin/index_body.php @@ -55,7 +55,7 @@ else if ($dopost == 'setskin') { if(trim($row['editcon'])==''){ $row['editcon'] = 'archives_edit.php'; } - $rowarcrank = $row['arcrank']==-1? " [未审核]":""; + $rowarcrank = $row['arcrank']==-1? " [未审核]":""; $pubdate = GetDateMk($row['pubdate']); echo ""; } @@ -80,7 +80,7 @@ else if ($dopost == 'setskin') { if (empty($cfg_auth_code)) { echo json_encode(array( "code" => -1002, - "msg" => "当前站点尚未购买商业版授权", + "msg" => "当前站点尚未升级商业版授权", "result" => null, )); exit; diff --git a/src/admin/module_main.php b/src/admin/module_main.php index e3f01882..fc31abb3 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -138,7 +138,7 @@ else if ($action == 'setup') { $prvdirs[$prvdir][1] = TestWriteAble($prvdir); } } - $prvdir = "
请按说明修改设置：请按说明修改设置：
{$row['title']}{$rowarcrank}{$pubdate}
\r\n"; + $prvdir = "
\r\n"; $prvdir .= "\r\n"; foreach ($prvdirs as $k => $v) { if ($v) $cw = '√'; diff --git a/src/admin/search_keywords_main.php b/src/admin/search_keywords_main.php index 823c8ff2..f2766d87 100644 --- a/src/admin/search_keywords_main.php +++ b/src/admin/search_keywords_main.php @@ -60,7 +60,7 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid') $start = ($pageno - 1) * $pagesize; $printhead = " -
目录可写
+
diff --git a/src/admin/sys_admin_user_tj.php b/src/admin/sys_admin_user_tj.php index a467b300..f4bcb3ca 100644 --- a/src/admin/sys_admin_user_tj.php +++ b/src/admin/sys_admin_user_tj.php @@ -100,7 +100,7 @@ if (isset($dopost) && $dopost == 'getone') { $ddd = $row['dd'] + $ddd; $ccd = $row['cc'] + $ccd; - $msg = "
选择 ID
+ $msg = "
diff --git a/src/admin/sys_info.php b/src/admin/sys_info.php index 73233f0c..42165047 100644 --- a/src/admin/sys_info.php +++ b/src/admin/sys_info.php @@ -98,7 +98,7 @@ else if ($dopost == 'search') { $keywords = isset($keywords) ? strip_tags($keywords) : ''; $i = 1; $configstr = << +
管理员::统计信息 全部(文档|点击)
@@ -113,7 +113,7 @@ EOT; $dsql->Execute(); while ($row = $dsql->GetArray()) { - $bgcolor = ($i++ % 2 == 0) ? "#F9FCEF" : "#ffffff"; + $bgcolor = ($i++ % 2 == 0) ? "#f6f6f6" : "#ffffff"; $row['info'] = preg_replace("#{$keywords}#", ''.$keywords.'', $row['info']); $row['varname'] = preg_replace("#{$keywords}#", ''.$keywords.'', $row['varname']); ?> @@ -146,7 +146,7 @@ EOT; exit; } if ($i == 1) { - echo ' + echo '
参数说明
没有找到搜索的内容
'; } diff --git a/src/admin/sys_safetest.php b/src/admin/sys_safetest.php index 4977e4e8..b445503e 100644 --- a/src/admin/sys_safetest.php +++ b/src/admin/sys_safetest.php @@ -15,7 +15,6 @@ if (empty($action)) $action = ''; if (empty($message)) $message = '尚未进行检测……'; if (empty($filetype)) $filetype = 'php|inc'; if (empty($info)) $info = 'eval|cmd|system|exec|_GET|_POST|_REQUEST|base64_decode'; - $fileHashURL = "https://cdn.dedebiz.com/release/{$cfg_version_detail}.json"; $del = new DedeHttpDown(); $del->OpenUrl($fileHashURL); @@ -24,42 +23,31 @@ $offFiles = array(); foreach ($filelist as $key => $ff) { $offFiles[$ff->filename] = $ff->hash; } - $alter = ""; - if (count($offFiles) == 0) { $alter = ' - '; + '; } - function TestOneFile($f) { global $message, $info, $offFiles; $str = ''; - //排除safefile和data/tplcache目录 if (preg_match("#data/tplcache|.svn|data/cache#", $f)) return -1; - $fp = fopen($f, 'r'); while (!feof($fp)) { $str .= fgets($fp, 1024); } fclose($fp); - if (preg_match("#(".$info.")[ \r\n\t]{0,}([\[\(])#i", $str)) { $trfile = preg_replace("#^".DEDEROOT."#", '', $f); $oldTrfile = $trfile; $trfile = '/'.substr(str_replace("\\", "/", $trfile), 1); - $localFilehash = md5_file($f); $remoteFilehash = isset($offFiles[$trfile]) ? $offFiles[$trfile] : ''; - if ($localFilehash === $remoteFilehash) { return 0; } - $message .= "
可疑文件：{$trfile}
修改记录 @@ -70,7 +58,6 @@ function TestOneFile($f) } return 0; } - function TestSafe($tdir) { global $filetype; @@ -85,11 +72,9 @@ function TestSafe($tdir) } } } - //检测 if ($action == 'test') { $message = ''; - AjaxHead(); TestSafe(DEDEROOT); if ($message == '') $message = "没发现可疑文件"; @@ -101,12 +86,10 @@ if ($action == 'test') { ShowMsg("没有选择对应的文件", "-1"); exit; } - $baseFile = "https://cdn.dedebiz.com/release/{$cfg_version_detail}$filename"; $del = new DedeHttpDown(); $del->OpenUrl($baseFile); $base = $del->GetHTML(); - $file = "$cfg_basedir/$filename"; $new = ""; if (is_file($file)) { @@ -114,9 +97,7 @@ if ($action == 'test') { $new = fread($fp, filesize($file)); fclose($fp); } - include(dirname(__FILE__).'/templets/sys_safetest_viewdiff.htm'); - exit(); } //清空模板缓存 @@ -137,6 +118,5 @@ else if ($action == 'clear') { echo $message; exit(); } - include(dirname(__FILE__).'/templets/sys_safetest.htm'); ?> \ No newline at end of file diff --git a/src/admin/templets/action_search.htm b/src/admin/templets/action_search.htm index 1cacd1d3..f8381909 100644 --- a/src/admin/templets/action_search.htm +++ b/src/admin/templets/action_search.htm @@ -8,11 +8,11 @@ - +
- + @@ -20,7 +20,7 @@
当前位置  > 搜索结果
""的搜索结果
- + - +
=> =>
@@ -37,7 +37,7 @@
diff --git a/src/admin/templets/ad_add.htm b/src/admin/templets/ad_add.htm index 5bf97ff1..195c5ef9 100644 --- a/src/admin/templets/ad_add.htm +++ b/src/admin/templets/ad_add.htm @@ -75,7 +75,7 @@ - +
diff --git a/src/admin/templets/ad_edit.htm b/src/admin/templets/ad_edit.htm index aa21d865..ecc4e123 100644 --- a/src/admin/templets/ad_edit.htm +++ b/src/admin/templets/ad_edit.htm @@ -44,7 +44,7 @@ -
广告管理 > 增加广告位置
+
diff --git a/src/admin/templets/ad_main.htm b/src/admin/templets/ad_main.htm index 0c85544c..cfcf2a77 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -9,7 +9,7 @@ -
 广告管理 > 修改广告
+
{/dede:datalist} - + diff --git a/src/admin/templets/adtype_main.htm b/src/admin/templets/adtype_main.htm index eed4b52e..965a359b 100644 --- a/src/admin/templets/adtype_main.htm +++ b/src/admin/templets/adtype_main.htm @@ -6,7 +6,7 @@ -
广告管理  增加一个新广告 @@ -69,7 +69,7 @@
{dede:pagelist listsize=5/}
+
@@ -35,7 +35,7 @@ ?> - + @@ -43,7 +43,7 @@ 新增 - +
广告分类管理 [广告管理]
新增一个广告类型：新增一个广告类型：
diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index 1feb4c64..994e9042 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -53,8 +53,7 @@ table{border-collapse:separate} -
+ @@ -92,7 +91,7 @@ table{border-collapse:separate} - +
@@ -219,7 +218,7 @@ table{border-collapse:separate} - +
 图集选项： 图集选项：
@@ -346,7 +345,7 @@ table{border-collapse:separate}
- +