diff --git a/docs/changelog.md b/docs/changelog.md index 4279b701..00be92e7 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,6 +1,25 @@ # 更新记录 通过访问 https://www.dedebiz.com/git 获取完整更新记录 +# V6.3.0 +- 再次优化后台部分代码面向对象,提高性能正确引导,致力于轻型后台系统; +- 添加后台刷新功能; +- 增强更新系统缓存功能,清理缓存文件; +- 优化后台布局细节处理并支持手机端后台部分显示; +- 优化后台和前台引用资源方便维护; +- 优化提示类说明注释文字及页面元素; +- 优化默认模板标签,新加的元素; +- 优化会员中心资料修改繁琐问题; +- 优化默认模板和插件模板; +- 优化自定义表单搜索功能,新加获取提交链接和地址及时间; +- 优化标签管理搜索功能; +- 优化动态栏目生成目录文件夹问题; +- 修正浏览器错误提示; +- 修正伪静态栏目开启绝对链接问题; +- 修正富文本的错误问题; +- 移除安装目录功能,建议用绑定目录功能; +- 其他常规问题修复; + # V6.2.12 - 增加管理员密码修改工具; - 优化后台部分代码面向对象,提高性能正确引导,致力于打造高效、简约CMS系统; diff --git a/docs/dedebiz.png b/docs/dedebiz.png index e2b9c207..417c0ea6 100644 Binary files a/docs/dedebiz.png and b/docs/dedebiz.png differ diff --git a/docs/dedebiz_wechat_qr.jpg b/docs/dedebiz_wechat_qr.jpg index 4bdc7b80..655444c6 100644 Binary files a/docs/dedebiz_wechat_qr.jpg and b/docs/dedebiz_wechat_qr.jpg differ diff --git a/src/admin/action_search.php b/src/admin/action_search.php index 3d814da0..e7552c21 100644 --- a/src/admin/action_search.php +++ b/src/admin/action_search.php @@ -11,7 +11,7 @@ require_once(dirname(__FILE__)."/config.php"); require_once(dirname(__FILE__)."/actionsearch_class.php"); //添加权限检查 -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; $keyword = empty($keyword) ? "" : RemoveXss($keyword); $actsearch = new ActionSearch($keyword); $asresult = $actsearch->Search(); diff --git a/src/admin/ad_add.php b/src/admin/ad_add.php index 0240df2e..eba353f6 100644 --- a/src/admin/ad_add.php +++ b/src/admin/ad_add.php @@ -11,7 +11,7 @@ require(dirname(__FILE__)."/config.php"); CheckPurview('plus_广告管理'); require_once DEDEINC."/typelink/typelink.class.php"; -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; if ($dopost == "save") { CheckCSRF(); //timeset tagname typeid normbody expbody @@ -30,24 +30,24 @@ if ($dopost == "save") { $normbody = "{$normbody['title']}"; } else if ($normbody['style'] == 'img') { if (empty($normbody['width'])) { - $width = ""; + $width = ''; } else { $width = " width=\"{$normbody['width']}\""; } if (empty($normbody['height'])) { - $height = ""; + $height = ''; } else { $height = "height=\"{$normbody['height']}\""; } - $normbody = ""; + $normbody = ""; } else { if (empty($normbody['width'])) { - $width = ""; + $width = ''; } else { $width = " width=\"{$normbody['width']}\""; } if (empty($normbody['height'])) { - $height = ""; + $height = ''; } else { $height = "height=\"{$normbody['height']}\""; } diff --git a/src/admin/ad_edit.php b/src/admin/ad_edit.php index 0f84b573..9c3d874e 100644 --- a/src/admin/ad_edit.php +++ b/src/admin/ad_edit.php @@ -20,18 +20,13 @@ if ($dopost == 'delete') { exit(); } else if ($dopost == "gettag") { require_once(DEDEINC.'/libraries/oxwindow.class.php'); - $jscode = ""; - $showhtml = "\r\n\r\n$jscode\r\n\r\n"; - $showhtml .= ""; $row = $dsql->GetOne("SELECT tagname from `#@__myad` WHERE aid='$aid' "); - $showtag = '{'."dede:myad name='{$row['tagname']}'/".'}'; - $wecome_info = "广告管理 - 获取标签"; + $tagcode = "{dede:myad name='{$row['tagname']}'/} "; + $showhtml = "

2种方法调用

$tagcode"; + $showhtml .= "

前台调用效果

"; + $wecome_info = "广告管理 - 调用示例"; $win = new OxWindow(); $win->Init(); - $win->AddTitle("标签调用代码"); - $winform = $win->GetWindow("hand", $showtag); - $win->myWinItem = ''; - $win->AddTitle("js调用代码"); $winform = $win->GetWindow("hand", $showhtml); $win->Display(); exit(); diff --git a/src/admin/album_add.php b/src/admin/album_add.php index 06afaca3..0d99d713 100644 --- a/src/admin/album_add.php +++ b/src/admin/album_add.php @@ -39,16 +39,16 @@ if ($dopost != 'save') { require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; - if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click); + if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click); if (!isset($typeid2)) $typeid2 = 0; if (!isset($autokey)) $autokey = 0; if (!isset($remote)) $remote = 0; if (!isset($dellink)) $dellink = 0; if (!isset($autolitpic)) $autolitpic = 0; if (!isset($ddisfirst)) $ddisfirst = 0; - if (!isset($albums)) $albums = ""; + if (!isset($albums)) $albums = ''; if (!isset($delzip)) $delzip = 0; - if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click); + if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click); if (trim($title) == '') { ShowMsg("文档标题不能为空", "-1"); exit(); @@ -121,7 +121,7 @@ if ($dopost != 'save') { $ntime = time(); $savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000,9999)); + $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999)); $fullUrl = $fullUrl.$ext; file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1])); $info = ''; @@ -226,7 +226,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 浏览图片文档发布图片文档修改图片文档管理图片文档$backurl + 浏览文档发布文档修改文档返回文档列表 "; $msg = "{$msg}".GetUpdateTest(); $wintitle = "成功发布图片文档"; diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index 74c1cdcf..83f335e8 100644 --- a/src/admin/album_edit.php +++ b/src/admin/album_edit.php @@ -58,7 +58,7 @@ if ($dopost != 'save') { if (!isset($remote)) $remote = 0; if (!isset($dellink)) $dellink = 0; if (!isset($autolitpic)) $autolitpic = 0; - if (!isset($albums)) $albums = ""; + if (!isset($albums)) $albums = ''; if (!isset($formzip)) $formzip = 0; if (!isset($ddisfirst)) $ddisfirst = 0; if (!isset($delzip)) $delzip = 0; @@ -195,7 +195,7 @@ if ($dopost != 'save') { $ntime = time(); $savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000,9999)); + $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999)); $fullUrl = $fullUrl.$ext; file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1])); $info = ''; @@ -268,7 +268,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 浏览图片文档发布图片文档修改图片文档管理图片文档$backurl + 浏览文档发布文档修改文档返回文档列表 "; $wintitle = "成功修改图片文档"; $wecome_info = "文档管理 - 修改图片文档"; diff --git a/src/admin/archives_add.php b/src/admin/archives_add.php index b1340815..4edcfbb8 100644 --- a/src/admin/archives_add.php +++ b/src/admin/archives_add.php @@ -42,13 +42,13 @@ if ($dopost != 'save') { require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; - if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click); + if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click); if (empty($typeid2)) $typeid2 = 0; if (!isset($autokey)) $autokey = 0; if (!isset($remote)) $remote = 0; if (!isset($dellink)) $dellink = 0; if (!isset($autolitpic)) $autolitpic = 0; - if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click); + if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click); if (trim($title) == '') { ShowMsg("文档标题不能为空", "-1"); exit(); @@ -172,7 +172,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 浏览自定义文档发布自定义文档修改自定义文档管理自定义文档$backurl + 浏览文档发布文档修改文档返回文档列表 "; $msg = "{$msg}".GetUpdateTest(); $wintitle = "成功发布自定义文档"; diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php index bc3b0d2e..ebf7610b 100644 --- a/src/admin/archives_do.php +++ b/src/admin/archives_do.php @@ -33,7 +33,7 @@ if ($dopost == 'editArchives') { $ntime = time(); $savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000,9999)); + $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999)); $fullUrl = $fullUrl.".png"; file_put_contents($cfg_basedir.$fullUrl, base64_decode($data[1])); //加水印 @@ -149,7 +149,7 @@ else if ($dopost == "uploadLitpic") { if (parent.document.getElementById('divpicview')) { parent.document.getElementById('divpicview').style.width = '150px'; - parent.document.getElementById('divpicview').innerHTML = \"\"; + parent.document.getElementById('divpicview').innerHTML = \"\"; } "; } else { @@ -268,7 +268,7 @@ else if ($dopost == "checkArchives") { - + @@ -368,7 +368,7 @@ else if ($dopost == "delArchives") { $wintitle = "删除指定文档"; $wecome_info = "文档管理 - 删除文档"; $win = new OxWindow(); - $win->Init("archives_do.php", "js/blank.js", "POST"); + $win->Init("archives_do.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("fmdo", "yes"); $win->AddHidden("dopost", $dopost); $win->AddHidden("qstr", $qstr); @@ -418,13 +418,13 @@ else if ($dopost == 'clear') { $wintitle = "清空回收站所有文档"; $wecome_info = "文档回收站 - 清空所有文档"; $win = new OxWindow(); - $win->Init("archives_do.php", "js/blank.js", "POST"); + $win->Init("archives_do.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("fmdo", "yes"); $win->AddHidden("dopost", $dopost); $win->AddHidden("qstr", $qstr); $win->AddHidden("aid", $aid); $win->AddHidden("recycle", $recycle); - $win->AddTitle("清空回收站".$num."篇文档
您确定删除,序号".$qstr."文档吗"); + $win->AddTitle("您确定删除".$num."篇文档,序号".$qstr."文档吗"); $winform = $win->GetWindow("ok"); $win->Display(); } @@ -456,7 +456,7 @@ else if ($dopost == 'del') { $wintitle = "删除指定文档"; $wecome_info = "文档管理 - 删除文档"; $win = new OxWindow(); - $win->Init("archives_do.php", "js/blank.js", "POST"); + $win->Init("archives_do.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("fmdo", "yes"); $win->AddHidden("dopost", $dopost); $win->AddHidden("qstr", $qstr); @@ -500,11 +500,11 @@ else if ($dopost == 'quickEdit') { $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC"); $dsql->Execute(); while ($trow = $dsql->GetObject()) { - if ($trow->att == 'j' || $trow->att == 'p') continue; + if ($trow->att == 'j') continue; if (preg_match("#".$trow->att."#", $arcRow['flag'])) - echo ""; + echo " "; else - echo ""; + echo " "; } ?> @@ -541,7 +541,7 @@ else if ($dopost == 'quickEdit') { - + @@ -608,7 +608,7 @@ else if ($dopost == "makekw") { $keywords = ''; $title = $row['title']; $description = $row['description']; - $body = cn_substr($row['body'], 5000); + $body = cn_substr($row['body'], 3000); $data = $client->Spliteword($title.Html2Text($body)); $keywords = $data->data; $description = str_replace(' ', ' ', trim($description)); @@ -631,7 +631,7 @@ else if ($dopost == "makekw") { $keywords = ''; $title = $row['title']; $description = $row['description']; - $body = cn_substr($row['body'], 5000); + $body = cn_substr($row['body'], 3000); $sp->SetSource($title, $cfg_soft_lang, $cfg_soft_lang); $sp->StartAnalysis(); $titleindexs = preg_replace("/#p#|#e#/", '', $sp->GetFinallyIndex()); @@ -767,8 +767,8 @@ else if ($dopost == 'attsDlg') { $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC"); $dsql->Execute(); while ($trow = $dsql->GetObject()) { - if ($trow->att == 'j' || $trow->att == 'p') continue; - echo ""; + if ($trow->att == 'j') continue; + echo " "; } ?> @@ -778,7 +778,7 @@ else if ($dopost == 'attsDlg') { - + diff --git a/src/admin/archives_edit.php b/src/admin/archives_edit.php index 60230eea..dbbafe09 100644 --- a/src/admin/archives_edit.php +++ b/src/admin/archives_edit.php @@ -157,7 +157,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 浏览自定义文档发布自定义文档修改自定义文档管理自定义文档$backurl + 浏览文档发布文档修改文档返回文档列表 "; $wintitle = "成功修改自定义文档"; $wecome_info = "文档管理 - 修改自定义文档"; diff --git a/src/admin/archives_sg_add.php b/src/admin/archives_sg_add.php index 4b1b90a9..026de492 100644 --- a/src/admin/archives_sg_add.php +++ b/src/admin/archives_sg_add.php @@ -127,7 +127,7 @@ if ($dopost != 'save') { ClearMyAddon($arcID, $title); //返回成功信息 $msg = " - 浏览分类文档发布分类文档修改分类文档管理分类文档$backurl + 浏览文档发布文档修改文档返回文档列表 "; $wintitle = "成功发布分类文档"; $wecome_info = "文档管理 - 发布分类文档"; diff --git a/src/admin/archives_sg_edit.php b/src/admin/archives_sg_edit.php index 3efb4128..c39142b6 100644 --- a/src/admin/archives_sg_edit.php +++ b/src/admin/archives_sg_edit.php @@ -110,7 +110,7 @@ if ($dopost != 'save') { ClearMyAddon($id, $title); //返回成功信息 $msg = " - 浏览分类文档发布分类文档修改分类文档管理分类文档$backurl + 浏览文档发布文档修改文档返回文档列表 "; $wintitle = "成功修改分类文档"; $wecome_info = "文档管理 - 修改分类文档"; diff --git a/src/admin/article_add.php b/src/admin/article_add.php index 178b0491..2f6ff713 100644 --- a/src/admin/article_add.php +++ b/src/admin/article_add.php @@ -50,7 +50,7 @@ if ($dopost != 'save') { if (!isset($remote)) $remote = 0; if (!isset($dellink)) $dellink = 0; if (!isset($autolitpic)) $autolitpic = 0; - if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click); + if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click); if (trim($title) == '') { ShowMsg("文档标题不能为空", "-1"); exit(); @@ -199,7 +199,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 浏览文档发布文档修改文档管理文档$backurl + 浏览文档发布文档修改文档返回文档列表 "; $msg = "{$msg}".GetUpdateTest(); $wintitle = "成功发布文档"; diff --git a/src/admin/article_allowurl_edit.php b/src/admin/article_allowurl_edit.php index 9c47a660..d9d5b6c9 100644 --- a/src/admin/article_allowurl_edit.php +++ b/src/admin/article_allowurl_edit.php @@ -31,7 +31,7 @@ if (empty($allurls) && filesize($m_file) > 0) { } $wecome_info = "允许站内链接"; $win = new OxWindow(); -$win->Init('article_allowurl_edit.php', 'js/blank.js', 'POST'); +$win->Init('article_allowurl_edit.php', '/static/web/js/admin.blank.js', 'POST'); $win->AddHidden('dopost', 'save'); $win->AddTitle("每行保存一个超链接"); $win->AddMsgItem(""); diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php index 69a7ac29..cbb60839 100644 --- a/src/admin/article_description_main.php +++ b/src/admin/article_description_main.php @@ -31,7 +31,7 @@ if ($dojob == '') { //获取自动摘要 if ($dojob == 'des') { if (empty($totalnum)) { - $addquery = ""; + $addquery = ''; if ($sid != 0) { $addquery .= " AND id>='$sid' "; } @@ -43,7 +43,7 @@ if ($dojob == '') { $totalnum = $row['dd']; } if ($totalnum > 0) { - $addquery = ""; + $addquery = ''; if ($sid != 0) { $addquery .= " AND `#@__archives`.id>='$sid' "; } @@ -82,7 +82,7 @@ if ($dojob == '') { $tjsta = "
$dvlen%
"; $tjsta .= "完成更新文档总数$tjlen%"; $nurl = "article_description_main.php?totalnum=$totalnum&startdd={$startdd}&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}"; - ShowMsg($tjsta, $nurl, 0, 500); + ShowMsg($tjsta, $nurl); exit(); } else { ShowMsg('完成所有任务', 'javascript:;'); @@ -92,7 +92,7 @@ if ($dojob == '') { //更新自动分页 if ($dojob == 'page') { require_once(DEDEADMIN."/inc/inc_archives_functions.php"); - $addquery = ""; + $addquery = ''; if ($sid != 0) { $addquery .= " and aid>='$sid' "; } @@ -111,7 +111,7 @@ if ($dojob == '') { } else if (($totalnum - $startdd) > 0) { $limitSql = " LIMIT $startdd,".($totalnum - $startdd); } else { - $limitSql = ""; + $limitSql = ''; } $tjnum = $startdd; if ($limitSql != "") { @@ -143,7 +143,7 @@ if ($dojob == '') { $tjsta .= "完成更新文档总数$tjlen%"; if ($tjnum < $totalnum) { $nurl = "article_description_main.php?totalnum=$totalnum&startdd=".($startdd + $pagesize)."&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}"; - ShowMsg($tjsta, $nurl, 0, 500); + ShowMsg($tjsta, $nurl); exit(); } else { ShowMsg('完成所有任务', 'javascript:;'); diff --git a/src/admin/article_edit.php b/src/admin/article_edit.php index 9e79e1b4..9b4cbcdb 100644 --- a/src/admin/article_edit.php +++ b/src/admin/article_edit.php @@ -171,7 +171,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 浏览文档发布文档修改文档管理文档$backurl + 浏览文档发布文档修改文档返回文档列表 "; $wintitle = "成功修改文档"; $wecome_info = "文档管理 - 修改文档"; diff --git a/src/admin/article_keywords_main.php b/src/admin/article_keywords_main.php index 374d34e9..1562da96 100644 --- a/src/admin/article_keywords_main.php +++ b/src/admin/article_keywords_main.php @@ -81,6 +81,6 @@ $dlist->Display(); function GetSta($sta) { if ($sta == 1) return ''; - else return 'checked="checked"'; + else return 'checked'; } ?> \ No newline at end of file diff --git a/src/admin/article_keywords_select.php b/src/admin/article_keywords_select.php index 83c59bd4..29d916a3 100644 --- a/src/admin/article_keywords_select.php +++ b/src/admin/article_keywords_select.php @@ -12,7 +12,7 @@ require_once(dirname(__FILE__)."/config.php"); require_once(DEDEINC."/datalistcp.class.php"); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); $f = RemoveXSS($f); -if (empty($keywords)) $keywords = ""; +if (empty($keywords)) $keywords = ''; $sql = "SELECT * FROM `#@__keywords` ORDER BY `rank` DESC"; $dlist = new DataListCP(); $dlist->SetTemplate(DEDEADMIN."/templets/article_keywords_select.htm"); diff --git a/src/admin/article_select_sw.php b/src/admin/article_select_sw.php index ab992071..bc3ba978 100644 --- a/src/admin/article_select_sw.php +++ b/src/admin/article_select_sw.php @@ -14,20 +14,20 @@ header("Expires:0"); if ($t == 'source') { $m_file = DEDEDATA."/admin/source.txt"; $allsources = file($m_file); - echo "
设置关闭
\r\n"; - echo "
\r\n"; + echo "
设置关闭
\r\n"; + echo "
\r\n"; foreach ($allsources as $v) { $v = trim($v); if ($v != "") { - echo "$v | \r\n"; + echo "$v | \r\n"; } } echo "
"; } else { //作者列表 $m_file = DEDEDATA."/admin/writer.txt"; - echo "
设置关闭
\r\n"; - echo "
\r\n"; + echo "\r\n"; + echo "
\r\n"; if (filesize($m_file) > 0) { $fp = fopen($m_file, 'r'); $str = fread($fp, filesize($m_file)); @@ -36,7 +36,7 @@ if ($t == 'source') { foreach ($strs as $str) { $str = trim($str); if ($str != "") { - echo "$str | "; + echo "$str | "; } } } diff --git a/src/admin/article_source_edit.php b/src/admin/article_source_edit.php index 9fe26851..a70b3752 100644 --- a/src/admin/article_source_edit.php +++ b/src/admin/article_source_edit.php @@ -31,7 +31,7 @@ if (empty($allsource) && filesize($m_file) > 0) { } $wecome_info = "文档来源管理"; $win = new OxWindow(); -$win->Init('article_source_edit.php', 'js/blank.js', 'POST'); +$win->Init('article_source_edit.php', '/static/web/js/admin.blank.js', 'POST'); $win->AddHidden('dopost', 'save'); $win->AddTitle("一行填写一个地址"); $win->AddMsgItem(""); diff --git a/src/admin/article_writer_edit.php b/src/admin/article_writer_edit.php index 545367db..98762c19 100644 --- a/src/admin/article_writer_edit.php +++ b/src/admin/article_writer_edit.php @@ -31,9 +31,9 @@ if (empty($allwriter) && filesize($m_file) > 0) { } $wecome_info = "文档作者管理"; $win = new OxWindow(); -$win->Init('article_writer_edit.php', 'js/blank.js', 'POST'); +$win->Init('article_writer_edit.php', '/static/web/js/admin.blank.js', 'POST'); $win->AddHidden('dopost', 'save'); -$win->AddTitle("作者姓名用英文逗号分开"); +$win->AddTitle("作者姓名用英文逗号隔开"); $win->AddMsgItem(""); $winform = $win->GetWindow('ok'); $win->Display(); diff --git a/src/admin/cards_manage.php b/src/admin/cards_manage.php index 675e14c2..4e606367 100644 --- a/src/admin/cards_manage.php +++ b/src/admin/cards_manage.php @@ -13,7 +13,7 @@ require_once(DEDEINC.'/datalistcp.class.php'); $dopost = empty($dopost) ? "" : $dopost; if ($dopost == "delete") { $ids = explode('`', $aids); - $dquery = ""; + $dquery = ''; foreach ($ids as $id) { if ($dquery == "") $dquery .= "aid='$id' "; else $dquery .= " OR aid='$id' "; diff --git a/src/admin/cards_type.php b/src/admin/cards_type.php index 508ab1fc..97bfec9a 100644 --- a/src/admin/cards_type.php +++ b/src/admin/cards_type.php @@ -10,7 +10,7 @@ */ require_once(dirname(__FILE__).'/config.php'); CheckPurview('member_Type'); -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; //保存修改 if ($dopost == "save") { $startID = 1; diff --git a/src/admin/catalog_add.php b/src/admin/catalog_add.php index 6ec35882..8da51e10 100644 --- a/src/admin/catalog_add.php +++ b/src/admin/catalog_add.php @@ -137,7 +137,7 @@ if ($dopost == 'quick') { ShowMsg("跨站调用秘钥不能为空", "-1"); exit(); } - if ($ispart != 2) { + if ($ispart != 2 && $isdefault != -1) { //栏目的参照目录 if ($referpath == 'cmspath') $nextdir = '{cmspath}'; if ($referpath == 'basepath') $nextdir = ''; @@ -166,16 +166,16 @@ if ($dopost == 'quick') { } //创建目录 if ($ispart != 2) { - $true_typedir = str_replace("{cmspath}", $cfg_cmspath, $typedir); + $true_typedir = str_replace("{cmspath}", "", $typedir); $true_typedir = preg_replace("#\/{1,}#", "/", $true_typedir); if (!CreateDir($true_typedir)) { - ShowMsg("创建目录{$true_typedir}失败,请检查您的路径是否存在问题", "-1"); + ShowMsg("创建目录{$true_typedir}失败,请检查路径是否存在问题", "-1"); exit(); } } $in_query = "INSERT INTO `#@__arctype` (reid,topid,sortrank,typename,cnoverview,enname,enoverview,bigpic,litimg,typedir,isdefault,defaultname,issend,channeltype,tempindex,templist,temparticle,modname,namerule,namerule2,ispart,corank,description,keywords,seotitle,moresite,siteurl,sitepath,ishidden,`cross`,`crossid`,`content`,`smalltypes`,`apienabled`,`apikey`) VALUES ('$reid','$topid','$sortrank','$typename','$cnoverview','$enname','$enoverview','$bigpic','$litimg','$typedir','$isdefault','$defaultname','$issend','$channeltype','$tempindex','$templist','$temparticle','default','$namerule','$namerule2','$ispart','$corank','$description','$keywords','$seotitle','$moresite','$siteurl','$sitepath','$ishidden','$cross','$crossid','$content','$smalltypes','$apienabled','$apikey')"; if (!$dsql->ExecuteNoneQuery($in_query)) { - ShowMsg("保存目录数据时失败,请检查您的输入资料是否存在问题", "-1"); + ShowMsg("保存目录数据时失败,请检查输入资料是否存在问题", "-1"); exit(); } UpDateCatCache(); diff --git a/src/admin/catalog_del.php b/src/admin/catalog_del.php index f8ff8d48..9a6ed0b5 100644 --- a/src/admin/catalog_del.php +++ b/src/admin/catalog_del.php @@ -29,7 +29,7 @@ $row = $dsql->GetOne(); $wintitle = "删除栏目"; $wecome_info = "栏目管理 - 删除栏目"; $win = new OxWindow(); -$win->Init('catalog_del.php', 'js/blank.js', 'POST'); +$win->Init('catalog_del.php', '/static/web/js/admin.blank.js', 'POST'); $win->AddHidden('id', $id); $win->AddHidden('dopost', 'ok'); $win->AddTitle("您要确定要删除{$row['typename']}栏目吗"); diff --git a/src/admin/catalog_do.php b/src/admin/catalog_do.php index a5c98346..93be244f 100644 --- a/src/admin/catalog_do.php +++ b/src/admin/catalog_do.php @@ -63,7 +63,7 @@ else if ($dopost == "listArchives") { $row = $dsql->GetOne("SELECT typename,id,mancon FROM `#@__channeltype` WHERE id='$channelid'"); $gurl = $row["mancon"]; $channelid = $row["id"]; - $typename = ""; + $typename = ''; $channelname = $row["typename"]; } if (empty($gurl)) $gurl = 'content_list.php'; @@ -98,7 +98,7 @@ else if ($dopost == "upRank") { $dsql->ExecuteNoneQuery("UPDATE `#@__arctype` SET sortrank='$sortrank' WHERE id='$cid'"); } UpDateCatCache(); - ShowMsg("完成操作,正在返回栏目管理", "catalog_main.php"); + ShowMsg("成功更新栏目排序", "catalog_main.php"); exit(); } //检查权限许可 @@ -114,7 +114,7 @@ else if ($dopost == "upRankAll") { } } UpDateCatCache(); - ShowMsg("完成操作,正在返回栏目管理", "catalog_main.php"); + ShowMsg("成功更新栏目排序", "catalog_main.php"); exit(); } //更新栏目缓存 @@ -139,7 +139,7 @@ else if ($dopost == "upcatcache") { $doarray[$tb] = 1; } } - ShowMsg("完成更新,正在返回栏目管理", "catalog_main.php"); + ShowMsg("成功更新栏目缓存", "catalog_main.php"); exit(); } //获得子类的文档 @@ -156,7 +156,7 @@ else if ($dopost == "GetSunListsMenu") { PutCookie('lastCid', $cid, 3600 * 24, "/"); $tu = new TypeUnit(); $tu->dsql = $dsql; - echo "\r\n"; + echo "
\r\n"; $tu->LogicListAllSunType($cid, " "); echo "
\r\n"; $tu->Close(); @@ -182,7 +182,7 @@ else if ($dopost == 'unitCatalog') { $wintitle = "合并指定栏目"; $wecome_info = "栏目管理 - 合并栏目"; $win = new OxWindow(); - $win->Init('catalog_do.php', 'js/blank.js', 'POST'); + $win->Init('catalog_do.php', '/static/web/js/admin.blank.js', 'POST'); $win->AddHidden('dopost', 'unitCatalog'); $win->AddHidden('typeid', $typeid); $win->AddHidden('channelid', $channelid); @@ -231,7 +231,7 @@ else if ($dopost == 'moveCatalog') { $wintitle = "移动指定栏目"; $wecome_info = "栏目管理 - 移动栏目"; $win = new OxWindow(); - $win->Init('catalog_do.php', 'js/blank.js', 'POST'); + $win->Init('catalog_do.php', '/static/web/js/admin.blank.js', 'POST'); $win->AddHidden('dopost', 'moveCatalog'); $win->AddHidden('typeid', $typeid); $win->AddHidden('channelid', $channelid); diff --git a/src/admin/config.php b/src/admin/config.php index b0236ee3..323f5f35 100644 --- a/src/admin/config.php +++ b/src/admin/config.php @@ -34,7 +34,7 @@ if (!isset($GLOBALS['csrf_token']) || $GLOBALS['csrf_token'] === null) { if (strtoupper($_SERVER['REQUEST_METHOD']) !== 'POST') { PutCookie('dede_csrf_token', $GLOBALS['csrf_token'], 7200, '/'); } -//获得当前脚本名称,如果您的系统被禁用了$_SERVER变量,请自行修改这个选项 +//获得当前脚本名称,如果系统被禁用了$_SERVER变量,请自行修改这个选项 $dedeNowurl = $s_scriptName = ''; $isUrlOpen = @ini_get('allow_url_fopen'); $dedeNowurl = GetCurUrl(); diff --git a/src/admin/content_list.php b/src/admin/content_list.php index 2ccba983..25722221 100644 --- a/src/admin/content_list.php +++ b/src/admin/content_list.php @@ -168,7 +168,7 @@ $dlist->SetParameter('orderby', $orderby); $dlist->SetParameter('arcrank', $arcrank); $dlist->SetParameter('channelid', $channelid); $dlist->SetParameter('f', $f); -$strTimerange = ""; +$strTimerange = ''; if ($stime > 0 && $etime > 0) { $strTimerange = implode(" - ",array(MyDate("Y-m-d H:i:s",$stime),MyDate("Y-m-d H:i:s",$etime))); $dlist->SetParameter('timerange', $strTimerange); diff --git a/src/admin/content_sg_list.php b/src/admin/content_sg_list.php index 1196ed7a..94b0354e 100644 --- a/src/admin/content_sg_list.php +++ b/src/admin/content_sg_list.php @@ -80,7 +80,7 @@ $dlist->SetParameter("dopost", "listArchives"); $dlist->SetParameter("keyword", $keyword); $dlist->SetParameter("cid", $cid); $dlist->SetParameter("channelid", $channelid); -$strTimerange = ""; +$strTimerange = ''; if ($stime > 0 && $etime > 0) { $strTimerange = implode(" - ",array(MyDate("Y-m-d H:i:s",$stime),MyDate("Y-m-d H:i:s",$etime))); $dlist->SetParameter('timerange', $strTimerange); diff --git a/src/admin/css/albumupload.min.css b/src/admin/css/albumupload.min.css deleted file mode 100644 index 5d30ef5e..00000000 --- a/src/admin/css/albumupload.min.css +++ /dev/null @@ -1 +0,0 @@ -#btnsubmit{margin:0px 0px 0px 150px}.swfupload{vertical-align:top}.message{margin:10px 0;padding:10px 20px;background:rgb(255,255,204);border:1px solid rgb(255,221,153);overflow:hidden}.picinfo{margin:10px 0;height:30px;line-height:30px}.atlas{float:left;margin-right:10px;margin-bottom:10px;width:220px;height:auto;background:#f5f5f5;text-align:center;border-radius:.5rem}.atlas-head{height:120px}.atlas-head img{margin:0;max-width:220px;max-height:120px;border-radius:.5rem .5rem 0 0!important}.atlas-input{width:220px}.atlas-box{margin:.5rem 0}.atlas-foot input[type=text]{border-radius:0 0 .5rem .5rem!important} \ No newline at end of file diff --git a/src/admin/css/login.min.css b/src/admin/css/login.min.css deleted file mode 100644 index 9f60796a..00000000 --- a/src/admin/css/login.min.css +++ /dev/null @@ -1 +0,0 @@ -body{line-height:1.6;letter-spacing:0.6px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2{line-height:1.2;font-size:24px;color:#393d49;font-weight:600}.btn,input,select{font-size:14px!important}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.logo,.form-control{height:36px}.login-from{margin:5rem auto;width:500px}.login-box{padding:1.25rem;background:#fff}.login-box,.form-control,.btn-md,.alert,.rounded{border-radius:.5rem!important}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}#validateimg{border-radius:0 .5rem .5rem 0;cursor:pointer}#browsehappy{padding:1rem 30px;font-size:14px;color:#856404;background:#fff3cd}.browsehappy-close{float:right;font-size:14px;cursor:pointer}@media (max-width:760px){.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}.login-from{width:100%}} \ No newline at end of file diff --git a/src/admin/dialog/config.php b/src/admin/dialog/config.php index eb362eae..9c499d4e 100644 --- a/src/admin/dialog/config.php +++ b/src/admin/dialog/config.php @@ -10,7 +10,7 @@ */ require_once(dirname(__FILE__)."/../../system/common.inc.php"); require_once(DEDEINC."/userlogin.class.php"); -//获得当前脚本名称,如果您的系统被禁用了$_SERVER变量,请自行修改这个选项 +//获得当前脚本名称,如果系统被禁用了$_SERVER变量,请自行修改这个选项 $dedeNowurl = ''; $s_scriptName = ''; $isUrlOpen = @ini_get('allow_url_fopen'); @@ -25,7 +25,7 @@ if ($cuserLogin->getUserID() <= 0) { exit(); } $adminDirHand = HtmlReplace($adminDirHand, 1); - $gurl = "../../{$adminDirHand}/login.php?gotopage=".urlencode($dedeNowurl); + $gurl = "/../{$adminDirHand}/login.php?gotopage=".urlencode($dedeNowurl); echo ""; exit(); } diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php index 04f0cd07..66d375ce 100644 --- a/src/admin/dialog/select_images.php +++ b/src/admin/dialog/select_images.php @@ -56,14 +56,14 @@ if (!empty($iseditor)) { 选择图片 - - - - + + + + - -
- + +
+
- + "; echo $line; @@ -125,19 +125,18 @@ if (!empty($iseditor)) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; $line = " - + "; echo "$line"; } else if (preg_match("#\.(".$cfg_imgtype.")#i", $file)) { $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; + if ($file == $comeback) $lstyle = "text-danger"; + else $lstyle = ''; $line = " @@ -147,13 +146,10 @@ if (!empty($iseditor)) { $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; + if ($file == $comeback) $lstyle = "text-danger"; + else $lstyle = ''; $line = " - + "; @@ -168,11 +164,6 @@ if (!empty($iseditor)) { function nullLink() { return; } - function TNav() { - if (window.navigator.userAgent.indexOf("MSIE") >= 1) return 'IE'; - else if (window.navigator.userAgent.indexOf("Firefox") >= 1) return 'FF'; - else return "OT"; - } //获取地址参数 function getUrlParam(paramName) { var reParam = new RegExp('(?:[\?&]|&)' + paramName + '=([^&]+)', 'i'); @@ -193,14 +184,6 @@ if (!empty($iseditor)) { if (window.opener.document. != null) { window.opener.document..value = reimg; if (window.opener.document.getElementById('div')) { - if (TNav() == 'IE') { - //window.opener.document.getElementById('div').filters.item('DXImageTransform.Microsoft.AlphaImageLoader').src = reimg; - window.opener.document.getElementById('div').src = reimg; - window.opener.document.getElementById('div').style.width = '150px'; - window.opener.document.getElementById('div').style.height = '100px'; - } else - window.opener.document.getElementById('div').style.backgroundImage = "url(" + reimg + ")"; - } else if (window.opener.document.getElementById('')) { window.opener.document.getElementById('').src = reimg; } //适配新的缩略图 @@ -217,8 +200,8 @@ if (!empty($iseditor)) { } $(function() { var x = 10; - var y = 20; - $("a.toolimg").mouseover(function(e) { + var y = 10; + $(".tipsimg").mouseover(function(e) { var toolimg = "
"; $("body").append(toolimg); $("#toolimg").css({ diff --git a/src/admin/dialog/select_images_post.php b/src/admin/dialog/select_images_post.php index 8a26a813..b7e5bb14 100644 --- a/src/admin/dialog/select_images_post.php +++ b/src/admin/dialog/select_images_post.php @@ -1,6 +1,6 @@ getUserID().'-'.dd2char(MyDate("ymdHis", $nowtme).mt_rand(100, 999)); +$filename_name = $cuserLogin->getUserID().'-'.dd2char(MyDate("ymdHis", $nowtme).mt_rand(1000, 6000)); $filename = $mdir.'/'.$filename_name; $fs = explode('.', $imgfile_name); $filename = $filename.'.'.$fs[count($fs) - 1]; diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php index 2489c61f..46f7dcdd 100644 --- a/src/admin/dialog/select_media.php +++ b/src/admin/dialog/select_media.php @@ -46,13 +46,13 @@ if (!empty($noeditor)) { 选择多媒体 - - - + + + - -
-
@@ -76,7 +76,7 @@ if (!empty($iseditor)) { - + @@ -94,8 +94,8 @@ if (!empty($iseditor)) {
上级目录 上级目录 当前目录:$activepath
$file $file
- - $file + $file $filesize KB $filetime
- - $file - $file $filesize KB $filetime
+ +
+
- + "; echo $line; @@ -105,7 +105,7 @@ if (!empty($noeditor)) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; $line = " - + "; echo "$line"; } else if (preg_match("#\.(swf|fly|fla|flv)#i", $file)) { @@ -113,12 +113,9 @@ if (!empty($noeditor)) { $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; + else $lstyle = ''; $line = " - + "; @@ -128,12 +125,9 @@ if (!empty($noeditor)) { $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; + else $lstyle = ''; $line = " - + "; @@ -143,12 +137,9 @@ if (!empty($noeditor)) { $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; + else $lstyle = ''; $line = " - + "; @@ -158,12 +149,9 @@ if (!empty($noeditor)) { $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; + else $lstyle = ''; $line = " - + "; diff --git a/src/admin/dialog/select_media_post.php b/src/admin/dialog/select_media_post.php index 64f99661..351e2fd1 100644 --- a/src/admin/dialog/select_media_post.php +++ b/src/admin/dialog/select_media_post.php @@ -1,6 +1,6 @@ 插入多图 - - - - + + +
- + @@ -58,8 +57,8 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php'); var upload_base_path = axupimgs.images_upload_base_path; //为列表添加排序 function reSort() { - document.querySelectorAll('#file_list li').forEach((el,i) => { - el.setAttribute('data-num',i); + document.querySelectorAll('#file_list li').forEach((el, i) => { + el.setAttribute('data-num', i); }); } function isFileImage(file) { @@ -86,9 +85,9 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php'); //reSort(); } //清空列表 - document.querySelector('#topbar .removeall').addEventListener('click',() => { + document.querySelector('#topbar .removeall').addEventListener('click', () => { axupimgs.res=[] - document.querySelectorAll('#file_list li').forEach((el,i) => { + document.querySelectorAll('#file_list li').forEach((el, i) => { el.parentNode.removeChild(el) }); }); @@ -125,7 +124,7 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php'); } }); //添加文件 - document.querySelector('#topbar .addfile').addEventListener('click',() => { + document.querySelector('#topbar .addfile').addEventListener('click', () => { var input = document.createElement('input'); input.setAttribute('type', 'file'); input.setAttribute('multiple', 'multiple'); @@ -144,7 +143,7 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php'); file_i=0; document.querySelector('#topbar .upall').innerText='全部上传'; //返回 - axupimgs.res.forEach((v,k) => { + axupimgs.res.forEach((v, k) => { let addonHTML = ``; window.opener.CKEDITOR.instances[""].insertHtml(addonHTML); }) @@ -157,7 +156,7 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php'); } else { blobInfo.file=axupimgs.res[n].file; blobInfo.isWater = document.querySelector('#isWater').checked; - upload_handler(blobInfo,function(url) { + upload_handler(blobInfo, function(url) { if (upload_base_path) { if (upload_base_path.slice(-1)=='/' && url.substr(0,1)=='/') { url = upload_base_path + url.slice(1); @@ -183,27 +182,27 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php'); }); } } - document.querySelector('#topbar .upall').addEventListener('click',(e) => { + document.querySelector('#topbar .upall').addEventListener('click', (e) => { if (e.target.innerText!='全部上传') { return false; } if (axupimgs.res.length > 0) { - document.querySelectorAll('#file_list li.up-no').forEach((el,i) => { + document.querySelectorAll('#file_list li.up-no').forEach((el, i) => { el.classList ? el.classList.add('up-now') : el.className+=' up-now'; }); e.target.innerText='上传中'; upAllFiles(0); } }); - var observ_flist = new MutationObserver( (muList,observe) => { + var observ_flist = new MutationObserver( (muList, observe) => { if (muList[0].addedNodes.length > 0) { muList[0].addedNodes.forEach((el) => { - el.querySelector('.remove').addEventListener('click',(e) => { + el.querySelector('.remove').addEventListener('click', (e) => { var li = e.target.parentNode.parentNode; var n = li.getAttribute('data-num'); var el = document.querySelectorAll('#file_list li')[n]; el.parentNode.removeChild(el); - axupimgs.res.splice(n,1); + axupimgs.res.splice(n, 1); }); }); } diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index 935d4da8..a600e5d0 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -46,13 +46,13 @@ if (!empty($noeditor)) { 选择软件 - - - + + + - -
-
@@ -73,8 +73,8 @@ if (!empty($noeditor)) {
上级目录 上级目录 当前目录:$activepath
$file $file
- - $file - $file $filesize KB $filetime
- - $file - $file $filesize KB $filetime
- - $file - $file $filesize KB $filetime
- - $file - $file $filesize KB $filetime
+ +
+
- + \r\n"; echo $line; @@ -107,20 +107,17 @@ if (!empty($noeditor)) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; $line = " - + "; echo "$line"; } else if (preg_match("#\.(zip|rar|tgr.gz)#i", $file)) { if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; + else $lstyle = ''; $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; $line = " - + "; @@ -132,10 +129,7 @@ if (!empty($noeditor)) { $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; $line = " - + "; @@ -155,7 +149,7 @@ if (!empty($noeditor)) { window.opener.CKEDITOR.tools.callFunction(funcNum, reimg); } if (typeof window.opener.CKEDITOR.instances[""] !== "undefined") { - let addonHTML = `附件:${reimg}`; + let addonHTML = ` 附件:${reimg}`; window.opener.CKEDITOR.instances[""].insertHtml(addonHTML); } if (window.opener.document. != null) { diff --git a/src/admin/dialog/select_templets.php b/src/admin/dialog/select_templets.php index c778474d..69a4dd15 100644 --- a/src/admin/dialog/select_templets.php +++ b/src/admin/dialog/select_templets.php @@ -37,13 +37,13 @@ if (empty($comeback)) { 选择模板 - - - + + + - -
-
@@ -76,7 +76,7 @@ if (!empty($noeditor)) {
上级目录 上级目录 当前目录:$activepath
$file $file
- - $file - $file $filesize KB $filetime
- - $file - $file $filesize KB $filetime
+ +
+
- + \r\n"; echo $line; @@ -95,95 +95,77 @@ if (empty($comeback)) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; $line = " - + "; echo "$line"; } else if (preg_match("#\.(htm|html)#i", $file)) { if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; + else $lstyle = ''; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); $line = " - + "; echo "$line"; } else if (preg_match("#\.(css)#i", $file)) { if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; + else $lstyle = ''; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); $reurl = preg_replace("#".$templetdir."/#", "", $reurl); $line = " - + "; echo "$line"; } else if (preg_match("#\.(js)#i", $file)) { if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; + else $lstyle = ''; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); $line = " - + "; echo "$line"; } else if (preg_match("#\.(jpg)#i", $file)) { if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; + else $lstyle = ''; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); $line = " - + "; echo "$line"; } else if (preg_match("#\.(gif|png)#i", $file)) { if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; + else $lstyle = ''; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); $line = " - + "; echo "$line"; } else if (preg_match("#\.(txt)#i", $file)) { if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; + else $lstyle = ''; $reurl = "$activeurl/$file"; $reurl = preg_replace("#\.\.#", "", $reurl); $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); $line = " - + "; echo "$line"; diff --git a/src/admin/dialog/select_templets_post.php b/src/admin/dialog/select_templets_post.php index 5905f554..3e84cd25 100644 --- a/src/admin/dialog/select_templets_post.php +++ b/src/admin/dialog/select_templets_post.php @@ -1,6 +1,6 @@ GetOne("SELECT * FROM `#@__diyforms` WHERE diyid='$diyid'"); - if (empty($job)) $job = ""; + if (empty($job)) $job = ''; //确认提示 if ($job == "") { $wintitle = "删除所有自定义表"; $wecome_info = "自定义表单管理 - 删除自定义表单"; $win = new OxWindow(); - $win->Init("diy_edit.php", "js/blank.js", "POST"); + $win->Init("diy_edit.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("job", "yes"); $win->AddHidden("dopost", $dopost); $win->AddHidden("diyid", $diyid); diff --git a/src/admin/diy_list.php b/src/admin/diy_list.php index e8b84a6b..53fa76f3 100644 --- a/src/admin/diy_list.php +++ b/src/admin/diy_list.php @@ -13,7 +13,7 @@ CheckPurview('c_New'); $diyid = isset($diyid) && is_numeric($diyid) ? $diyid : 0; $action = isset($action) && in_array($action, array('post', 'list', 'edit', 'check', 'delete', 'excel')) ? $action : ''; if (empty($diyid)) { - showMsg("操作失败", 'javascript:;'); + showMsg('操作失败', '-1'); exit(); } require_once DEDEINC.'/diyform.class.php'; @@ -27,13 +27,13 @@ if ($action == 'post') { $dede_fieldshash = empty($dede_fieldshash) ? '' : trim($dede_fieldshash); if (!empty($dede_fields)) { if ($dede_fieldshash != md5($dede_fields.$cfg_cookie_encode)) { - showMsg("数据校验不对,程序返回", '-1'); + showMsg('数据校验不对', '-1'); exit(); } } $diyform = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid=$diyid"); if (!is_array($diyform)) { - showmsg("表单不存在,程序返回", '-1'); + showmsg('表单不存在', '-1'); exit(); } $addvar = $addvalue = ''; @@ -67,11 +67,19 @@ if ($action == 'post') { } } else if ($action == 'list') { include_once DEDEINC.'/datalistcp.class.php'; - $query = "SELECT * FROM {$diy->table} ORDER BY id DESC"; + if (empty($keyword)) { + $keyword = ''; + $addquery = ''; + } else { + $addquery = " WHERE {$field} LIKE '%".trim($keyword)."%' "; + } + $query = "SELECT * FROM {$diy->table} $addquery ORDER BY id DESC"; $datalist = new DataListCP(); $datalist->pagesize = 30; $datalist->SetParameter('action', 'list'); $datalist->SetParameter('diyid', $diyid); + $datalist->SetParameter('keyword', $keyword); + $datalist->SetParameter('field', $field); $datalist->SetTemplate(DEDEADMIN.'/templets/diy_list.htm'); $datalist->SetSource($query); $fieldlist = $diy->getFieldList(); @@ -80,13 +88,13 @@ if ($action == 'post') { if (empty($do)) { $id = isset($id) && is_numeric($id) ? $id : 0; if (empty($id)) { - showMsg('操作失败,未指定id', 'javascript:;'); + showMsg('操作失败,未指定id', '-1'); exit(); } $query = "SELECT * FROM {$diy->table} WHERE id=$id"; $row = $dsql->GetOne($query); if (!is_array($row)) { - showmsg("您浏览的记录不存在或未审核", '-1'); + showmsg('您浏览的记录不存在或待审核', '-1'); exit(); } $postform = $diy->getForm('edit', $row, 'admin'); @@ -99,7 +107,7 @@ if ($action == 'post') { $diyform = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid=$diyid"); $diyco = $dsql->GetOne("SELECT * FROM `$diy->table` WHERE id='$id'"); if (!is_array($diyform)) { - showmsg("表单不存在,程序返回", '-1'); + showmsg("表单不存在", '-1'); exit(); } $addsql = ''; @@ -193,12 +201,12 @@ if ($action == 'post') { { echo ""; } - $status = $arr['ifcheck'] == 1 ? '已审核' : '未审核'; + $status = $arr['ifcheck'] == 1 ? '已审核' : '待审核'; echo ""; echo ""; } echo "
@@ -63,8 +63,8 @@ if (empty($comeback)) {
上级目录 上级目录 当前目录:$activepath
$file $file
- - $file - $file $filesize KB $filetime
- - $file - $file $filesize KB $filetime
- - $file - $file $filesize KB $filetime
- - $file - $file $filesize KB $filetime
- - $file - $file $filesize KB $filetime
- - $file - $file $filesize KB $filetime
".$arr[$key]."".$status."
"; } else { - showmsg('未定义操作', "-1"); + showmsg('未定义操作', '-1'); } ?> \ No newline at end of file diff --git a/src/admin/erraddsave.php b/src/admin/erraddsave.php index 3002af79..7e83d957 100644 --- a/src/admin/erraddsave.php +++ b/src/admin/erraddsave.php @@ -1,6 +1,6 @@ 错误管理 - 删除错误"; $win = new OxWindow(); - $win->Init("erraddsave.php", "js/blank.js", "POST"); + $win->Init("erraddsave.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("fmdo", "yes"); $win->AddHidden("dopost", $dopost); $win->AddHidden("id", $id); diff --git a/src/admin/feedback_edit.php b/src/admin/feedback_edit.php index def12503..cb3554ca 100644 --- a/src/admin/feedback_edit.php +++ b/src/admin/feedback_edit.php @@ -12,7 +12,7 @@ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_Feedback'); $id = isset($id) && is_numeric($id) ? $id : 0; $ENV_GOBACK_URL = empty($_COOKIE['ENV_GOBACK_URL']) ? "feedback_main.php" : $_COOKIE['ENV_GOBACK_URL']; -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; if ($dopost == 'edit') { $msg = cn_substrR($msg, 3500); $adminmsg = trim($adminmsg); diff --git a/src/admin/feedback_main.php b/src/admin/feedback_main.php index 1d6bdf4b..98670008 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) { @@ -31,7 +31,7 @@ function jsTrimjajx($str, $len) if (!empty($job)) { $ids = preg_replace("#[^0-9,]#", '', $fid); if (empty($ids)) { - ShowMsg("您没选中任何选项", $_COOKIE['ENV_GOBACK_URL'], 0, 500); + ShowMsg("您没选中任何选项", $_COOKIE['ENV_GOBACK_URL']); exit; } } else { @@ -48,7 +48,7 @@ function UpdateReplycount($id) if ($job == 'del') { $query = "DELETE FROM `#@__feedback` WHERE id IN($ids) "; $dsql->ExecuteNoneQuery($query); - ShowMsg("成功删除指定的评论", $_COOKIE['ENV_GOBACK_URL'], 0, 500); + ShowMsg("成功删除指定的评论", $_COOKIE['ENV_GOBACK_URL']); exit(); } //删除相同IP的所有评论 @@ -63,7 +63,7 @@ else if ($job == 'delall') { $query = "DELETE FROM `#@__feedback` WHERE $ips "; $dsql->ExecuteNoneQuery($query); } - ShowMsg("删除所有相同地址评论", $_COOKIE['ENV_GOBACK_URL'], 0, 500); + ShowMsg("删除所有相同地址评论", $_COOKIE['ENV_GOBACK_URL']); exit(); } //审核评论 @@ -76,7 +76,7 @@ else if ($job == 'check') { while ($row = $dsql->GetArray()) { UpdateReplycount($row['fid']); } - ShowMsg("成功审核指定评论", $_COOKIE['ENV_GOBACK_URL'], 0, 500); + ShowMsg("成功审核指定评论", $_COOKIE['ENV_GOBACK_URL']); exit(); } //浏览评论 diff --git a/src/admin/file_class.php b/src/admin/file_class.php index 940d6ff2..82a2a086 100644 --- a/src/admin/file_class.php +++ b/src/admin/file_class.php @@ -11,8 +11,8 @@ if (!defined('DEDEINC')) exit ('dedebiz'); */ class FileManagement { - var $baseDir = ""; - var $activeDir = ""; + var $baseDir = ''; + var $activeDir = ''; //是否允许文件管理器删除目录,默认为不允许0,如果希望管理整个目录,请把值设为1 var $allowDeleteDir = 0; //初始化系统 @@ -81,14 +81,14 @@ class FileManagement copy($oldfile, $truepath."/$mfile"); } unlink($oldfile); - ShowMsg("成功移动文件", "file_manage_main.php?activepath=$mpath", 0, 1000); + ShowMsg("成功移动文件", "file_manage_main.php?activepath=$mpath"); return 1; } else { - ShowMsg("移动文件".$oldfile." - ".$truepath."/".$mfile."失败", "file_manage_main.php?activepath=$mpath", 0, 1000); + ShowMsg("移动文件".$oldfile." - ".$truepath."/".$mfile."失败", "file_manage_main.php?activepath=$mpath"); return 0; } } else { - ShowMsg("您移动的路径不合法", "-1", 0, 5000); + ShowMsg("您移动的路径不合法", "-1"); return 0; } } diff --git a/src/admin/file_manage_control.php b/src/admin/file_manage_control.php index b162d409..73eabd7a 100644 --- a/src/admin/file_manage_control.php +++ b/src/admin/file_manage_control.php @@ -14,7 +14,7 @@ require(DEDEINC."/libraries/oxwindow.class.php"); require_once(DEDEADMIN.'/file_class.php'); $activepath = str_replace("..", "", $activepath); $activepath = preg_replace("#^\/{1,}#", "/", $activepath); -if ($activepath == "/") $activepath = ""; +if ($activepath == "/") $activepath = ''; if ($activepath == "") $inpath = $cfg_basedir; else $inpath = $cfg_basedir.$activepath; $files = json_decode(file_get_contents(DEDEDATA.'/admin/files.txt')); @@ -154,7 +154,7 @@ else if ($fmdo == "space") { $totalkb = $space->setkb($total); $totalmb = $space->setmb($total); $win = new OxWindow(); - $win->Init("", "js/blank.js", "POST"); + $win->Init("", "/static/web/js/admin.blank.js", "POST"); $win->AddMsgItem(" $totalkbKB
@@ -163,7 +163,7 @@ else if ($fmdo == "space") { - + "); $winform = $win->GetWindow(""); $win->Display(); diff --git a/src/admin/file_manage_main.php b/src/admin/file_manage_main.php index b22304ce..52ba6085 100644 --- a/src/admin/file_manage_main.php +++ b/src/admin/file_manage_main.php @@ -10,15 +10,15 @@ */ require(dirname(__FILE__)."/config.php"); CheckPurview('plus_文件管理器'); -if (!isset($activepath)) $activepath = DEDEBIZ_SAFE_MODE? $cfg_medias_dir : $cfg_cmspath; -$inpath = ""; +if (!isset($activepath)) $activepath = DEDEBIZ_SAFE_MODE? $cfg_medias_dir : '/'; +$inpath = ''; $activepath = str_replace("..", "", $activepath); $activepath = preg_replace("#^\/{1,}#", "/", $activepath); if (DEDEBIZ_SAFE_MODE && !preg_match("#^/static#",$activepath)) { ShowMsg("安全模式下仅允许查看修改static目录文档", -1); exit; } -if ($activepath == "/") $activepath = ""; +if ($activepath == "/") $activepath = ''; if ($activepath == "") $inpath = $cfg_basedir; else $inpath = $cfg_basedir.$activepath; $activeurl = $activepath; diff --git a/src/admin/file_manage_view.php b/src/admin/file_manage_view.php index f8df6086..c35ff352 100644 --- a/src/admin/file_manage_view.php +++ b/src/admin/file_manage_view.php @@ -13,7 +13,7 @@ CheckPurview('plus_文件管理器'); require_once(DEDEINC."/libraries/oxwindow.class.php"); $activepath = str_replace("..", "", $activepath); $activepath = preg_replace("#^\/{1,}#", "/", $activepath); -if ($activepath == "/") $activepath = ""; +if ($activepath == "/") $activepath = ''; if ($activepath == "") $inpath = $cfg_basedir; else $inpath = $cfg_basedir.$activepath; //修改文件名 @@ -23,7 +23,7 @@ if ($fmdo == "rename") { $wintitle = "修改指定文件名称"; $wecome_info = "文件管理 - 修改文件名称"; $win = new OxWindow(); - $win->Init("file_manage_control.php", "js/blank.js", "POST"); + $win->Init("file_manage_control.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("fmdo", $fmdo); $win->AddHidden("activepath", $activepath); $win->AddHidden("filename", $filename); @@ -40,7 +40,7 @@ else if ($fmdo == "newdir") { $wintitle = "新建文件目录"; $wecome_info = "文件管理 - 新建目录"; $win = new OxWindow(); - $win->Init("file_manage_control.php", "js/blank.js", "POST"); + $win->Init("file_manage_control.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("fmdo", $fmdo); $win->AddHidden("activepath", $activepath); $win->AddHidden("token", make_hash()); @@ -54,11 +54,11 @@ else if ($fmdo == "move") { $wintitle = "移动指定文件"; $wecome_info = "文件管理 - 移动文件"; $win = new OxWindow(); - $win->Init("file_manage_control.php", "js/blank.js", "POST"); + $win->Init("file_manage_control.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("fmdo", $fmdo); $win->AddHidden("activepath", $activepath); $win->AddHidden("filename", $filename); - $win->AddTitle("新位置前面不加'/'表示相对于当前位置,加'/'表示相对于根目录"); + $win->AddTitle("新位置前面不加斜杆/表示相对于当前位置,加斜杆/表示相对于根目录"); $win->AddItem("被移动文件:", $filename); $win->AddItem("当前位置:", $activepath); $win->AddItem("新位置:", ""); @@ -70,7 +70,7 @@ else if ($fmdo == "del") { $wintitle = "删除指定文件"; $wecome_info = "文件管理 - 删除文件"; $win = new OxWindow(); - $win->Init("file_manage_control.php", "js/blank.js", "POST"); + $win->Init("file_manage_control.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("fmdo", $fmdo); $win->AddHidden("activepath", $activepath); $win->AddHidden("filename", $filename); @@ -87,12 +87,12 @@ else if ($fmdo == "del") { //修改文件 else if ($fmdo == "edit") { if (!isset($backurl)) { - $backurl = ""; + $backurl = ''; } $activepath = str_replace("..", "", $activepath); $filename = str_replace("..", "", $filename); $file = "$cfg_basedir$activepath/$filename"; - $content = ""; + $content = ''; if (is_file($file)) { $fp = fopen($file, "r"); $content = fread($fp, filesize($file)); @@ -117,7 +117,7 @@ else if ($fmdo == "edit") { } //新建文件 else if ($fmdo == "newfile") { - $content = ""; + $content = ''; $GLOBALS['filename'] = "newfile.txt"; $GLOBALS['extension'] = 'text/html'; $contentView = "\r\n"; diff --git a/src/admin/freelist_add.php b/src/admin/freelist_add.php index 04a7890a..813dad3c 100644 --- a/src/admin/freelist_add.php +++ b/src/admin/freelist_add.php @@ -24,10 +24,6 @@ if (empty($dopost)) { ShowMsg("请输入自由列表标题", "-1"); exit(); } - if (empty($channel)) { - showmsg("请选择一个限定模型", "-1"); - exit(); - } if (is_array($types)) { foreach ($types as $v) $ntype .= $v.' '; } diff --git a/src/admin/freelist_edit.php b/src/admin/freelist_edit.php index 52dd365d..5786b796 100644 --- a/src/admin/freelist_edit.php +++ b/src/admin/freelist_edit.php @@ -30,10 +30,6 @@ if (empty($dopost)) { ShowMsg("请输入自由列表标题", "-1"); exit(); } - if (empty($channel)) { - showmsg("请选择一个限定模型", "-1"); - exit(); - } if (is_array($types)) { foreach ($types as $v) $ntype .= $v.' '; } diff --git a/src/admin/freelist_main.php b/src/admin/freelist_main.php index 4ce8b3f9..0a0ec5e8 100644 --- a/src/admin/freelist_main.php +++ b/src/admin/freelist_main.php @@ -56,15 +56,15 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid') { global $cfg_phpurl, $addsql; $start = ($pageno-1) * $pagesize; - $printhead =" + $printhead ="
- + - - + + - + "; @@ -81,9 +81,9 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid') "; echo $line; diff --git a/src/admin/friendlink_add.php b/src/admin/friendlink_add.php index 31349918..2dbe1b65 100644 --- a/src/admin/friendlink_add.php +++ b/src/admin/friendlink_add.php @@ -9,8 +9,8 @@ * @link https://www.dedebiz.com */ require(dirname(__FILE__)."/config.php"); -CheckPurview('plus_友情链接模块'); -if (empty($dopost)) $dopost = ""; +CheckPurview('plus_友情链接'); +if (empty($dopost)) $dopost = ''; if ($dopost == "add") { $dtime = time(); if (is_uploaded_file($logoimg)) { @@ -19,7 +19,7 @@ if ($dopost == "add") { if (!preg_match("#(jpg|gif|png)$#", $shortname)) { $shortname = '.gif'; } - $filename = MyDate("ymdHis", time()).mt_rand(1000,9999).$shortname; + $filename = MyDate("ymdHis", time()).mt_rand(1000, 9999).$shortname; $imgurl = $cfg_medias_dir."/flink"; if (!is_dir($cfg_basedir.$imgurl)) { MkdirAll($cfg_basedir.$imgurl, $cfg_dir_purview); @@ -56,7 +56,7 @@ if ($dopost == "add") { $rs = $dsql->ExecuteNoneQuery($query); $burl = empty($_COOKIE['ENV_GOBACK_URL']) ? "friendlink_main.php" : $_COOKIE['ENV_GOBACK_URL']; if ($rs) { - ShowMsg("成功添加一个链接", $burl, 0, 500); + ShowMsg("成功添加一个链接", $burl); exit(); } else { ShowMsg("添加链接时出错,原因:".$dsql->GetError(), "javascript:;"); diff --git a/src/admin/friendlink_edit.php b/src/admin/friendlink_edit.php index 818c12c8..bb50073a 100644 --- a/src/admin/friendlink_edit.php +++ b/src/admin/friendlink_edit.php @@ -9,9 +9,9 @@ * @link https://www.dedebiz.com */ require_once(dirname(__FILE__)."/config.php"); -CheckPurview('plus_友情链接模块'); +CheckPurview('plus_友情链接'); $ENV_GOBACK_URL = empty($_COOKIE['ENV_GOBACK_URL']) ? 'friendlink_main.php' : $_COOKIE['ENV_GOBACK_URL']; -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; $id = isset($id)? intval($id) : 0; if (isset($allid)) { $aids = explode(',', $allid); @@ -57,10 +57,10 @@ if ($dopost == "delete") { exit; } $logoimg_name = trim(preg_replace("#[ \r\n\t\*\%\\\/\?><\|\":]{1,}#", '', $logoimg_name)); - $fullfilename = DEDEROOT.'static/flink/'.$logoimg_name; + $fullfilename = DEDEROOT.'/static/flink/'.$logoimg_name; move_uploaded_file($logoimg, $fullfilename) or die("上传文件到".$fullfilename."失败"); @unlink($logoimg); - $logo = $cfg_cmspath.'/static/flink/'.$logoimg_name; + $logo = '/static/flink/'.$logoimg_name; } $sortrank = isset($sortrank)? intval($sortrank) : 1; $url = isset($url)? HtmlReplace($url, -1) : ''; diff --git a/src/admin/friendlink_main.php b/src/admin/friendlink_main.php index 51058a6c..07d408b6 100644 --- a/src/admin/friendlink_main.php +++ b/src/admin/friendlink_main.php @@ -21,7 +21,7 @@ if (empty($ischeck)) { else $ischeckSql = " And ischeck='$ischeck' "; } $keyword = HtmlReplace($keyword, -1); -$selCheckArr = array(0 => '不限类型', -1 => '未审核', 1 => '内页', 2 => '首页'); +$selCheckArr = array(0 => '不限类型', -1 => '待审核', 1 => '内页', 2 => '首页'); $sql = "SELECT * FROM `#@__flink` WHERE CONCAT(`url`,`webname`,`email`) LIKE '%$keyword%' $ischeckSql ORDER BY dtime DESC"; $dlist = new DataListCP(); $dlist->SetParameter('keyword', $keyword); @@ -38,6 +38,6 @@ function GetSta($sta) { if ($sta == 1) return '内页'; if ($sta == 2) return '首页'; - else return '未审核'; + else return '待审核'; } ?> \ No newline at end of file diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php index fd83ec79..35d8945b 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -52,7 +52,7 @@ $actionSearch[0] = array( ) ) ); -$actionSearch[2] = array( +$actionSearch[1] = array( 'title' => '附件管理', 'soniterm' => array( 0 => array( @@ -67,7 +67,7 @@ $actionSearch[2] = array( ), ) ); -$actionSearch[3] = array( +$actionSearch[2] = array( 'title' => '文档模型', 'soniterm' => array( 0 => DEDEBIZ_SAFE_MODE? null : array( @@ -90,19 +90,19 @@ $actionSearch[3] = array( 'purview' => 'c_List', 'linkurl' => 'freelist_main.php' ), - 3 => array( + 4 => array( 'title' => '自定义文档属性', 'purview' => 'sys_Att', 'linkurl' => 'content_att.php' ), - 4 => array( + 5 => array( 'title' => '自定义表单管理', 'purview' => 'c_List', 'linkurl' => 'diy_main.php' ), ) ); -$actionSearch[4] = array( +$actionSearch[3] = array( 'title' => '批量维护', 'soniterm' => array( 0 => array( @@ -115,29 +115,29 @@ $actionSearch[4] = array( 'purview' => 'sys_ArcBatch', 'linkurl' => 'article_test_same.php' ), - 3 => array( + 2 => array( 'title' => '文档关键词维护', 'purview' => 'sys_Keyword', 'linkurl' => 'article_keywords_main.php' ), - 4 => array( + 3 => array( 'title' => '搜索关键词维护', 'purview' => 'sys_Keyword', 'linkurl' => 'search_keywords_main.php?dopost=filemanager' ), - 5 => array( + 4 => array( 'title' => '自动摘要分页', 'purview' => 'sys_Keyword', 'linkurl' => 'article_description_main.php' ), - 6 => DEDEBIZ_SAFE_MODE? null : array( + 5 => DEDEBIZ_SAFE_MODE? null : array( 'title' => '数据库字段替换', 'purview' => 'sys_ArcBatch', 'linkurl' => 'sys_data_replace.php' ), ) ); -$actionSearch[5] = array( +$actionSearch[4] = array( 'title' => '会员管理', 'soniterm' => array( 0 => array( @@ -162,7 +162,7 @@ $actionSearch[5] = array( ), ) ); -$actionSearch[6] = array( +$actionSearch[5] = array( 'title' => '支付工具', 'soniterm' => array( 0 => array( @@ -192,7 +192,7 @@ $actionSearch[6] = array( ), ) ); -$actionSearch[7] = array( +$actionSearch[6] = array( 'title' => '更新任务', 'soniterm' => array( 0 => array( @@ -227,7 +227,7 @@ $actionSearch[7] = array( ), ) ); -$actionSearch[8] = DEDEBIZ_SAFE_MODE? null : array( +$actionSearch[7] = DEDEBIZ_SAFE_MODE? null : array( 'title' => '模板管理', 'soniterm' => array( 0 => array( @@ -257,7 +257,7 @@ $actionSearch[8] = DEDEBIZ_SAFE_MODE? null : array( ), ) ); -$actionSearch[9] = array( +$actionSearch[8] = array( 'title' => '系统设置', 'soniterm' => array( 0 => array( @@ -280,32 +280,32 @@ $actionSearch[9] = array( 'purview' => 'sys_Log', 'linkurl' => 'log_list.php' ), - 5 => array( + 4 => array( 'title' => '图片水印设置', 'purview' => 'sys_Edit', 'linkurl' => 'sys_info_mark.php' ), - 6 => array( + 5 => array( 'title' => '软件下载设置', 'purview' => 'sys_SoftConfig', 'linkurl' => 'soft_config.php' ), - 7 => DEDEBIZ_SAFE_MODE? null : array( + 6 => DEDEBIZ_SAFE_MODE? null : array( 'title' => '数据库备份还原', 'purview' => 'sys_data', 'linkurl' => 'sys_data.php' ), - 8 => DEDEBIZ_SAFE_MODE? null : array( + 7 => DEDEBIZ_SAFE_MODE? null : array( 'title' => 'SQL命令工具', 'purview' => 'sys_data', 'linkurl' => 'sys_sql_query.php' ), - 9 => array( + 8 => array( 'title' => '文件扫描工具', 'purview' => 'sys_verifies', 'linkurl' => 'sys_safetest.php' ), - 10 => array( + 9 => array( 'title' => '系统修复工具', 'purview' => 'sys_verifies', 'linkurl' => 'sys_repair.php' diff --git a/src/admin/inc/inc_admin_channel.php b/src/admin/inc/inc_admin_channel.php index 0d6097d3..a47fd8a2 100644 --- a/src/admin/inc/inc_admin_channel.php +++ b/src/admin/inc/inc_admin_channel.php @@ -87,7 +87,7 @@ function GetFieldMake($dtype, $fieldname, $dfvalue, $mxlen) function GetAddFieldList(&$dtp,&$oksetting) { $oklist = ''; - $dtp->SetNameSpace("field","<",">"); + $dtp->SetNameSpace("field", "<", ">"); $dtp->LoadSource($oksetting); if (is_array($dtp->CTags)) { foreach($dtp->CTags as $tagid=>$ctag) diff --git a/src/admin/inc/inc_archives_all.php b/src/admin/inc/inc_archives_all.php index b9a04773..b23fd831 100644 --- a/src/admin/inc/inc_archives_all.php +++ b/src/admin/inc/inc_archives_all.php @@ -1,6 +1,6 @@ GetName(); - $formitem = "
自由列表管理自由列表管理
id
id 列表名称 模板文件点击点击 创建时间 操作
{$row['click']} ".MyDate("y-m-d",$row['edtime'])." - 更新 - 修改 - 删除 + 更新 + 修改 + 删除
+ $formitem = "
- - + +
~name~~form~~name~~form~
\r\n"; $innertext = trim($ctag->GetInnerText()); @@ -48,7 +48,7 @@ function GetFormItem($ctag) $i = 0; if ($v != '') { if ($i == 0) { - $myformItem .= "\r\n"; + $myformItem .= "\r\n"; } else { $myformItem .= "\r\n"; } @@ -65,8 +65,8 @@ function GetFormItem($ctag) } } if ($ctag->GetAtt("type") == "htmltext" || $ctag->GetAtt("type") == "textdata") { - $formitem = ""; - $formitem .= ""; } else { $revalue = ''; } diff --git a/src/admin/inc/inc_batchup.php b/src/admin/inc/inc_batchup.php index 4d88a27a..2d8d8932 100644 --- a/src/admin/inc/inc_batchup.php +++ b/src/admin/inc/inc_batchup.php @@ -1,6 +1,6 @@ GetOne($query); @@ -102,11 +102,11 @@ function DelArc($aid, $type = 'ON', $onlyfile = FALSE, $recycle = 0) if (empty($arcRow['ismake'])) $arcRow['ismake'] = 1; if (empty($arcRow['arcrank'])) $arcRow['arcrank'] = 0; if (empty($arcRow['filename'])) $arcRow['filename'] = ''; - //删除HTML + //删除网页 if ($arcRow['ismake'] == -1 || $arcRow['arcrank'] != 0 || $arcRow['typeid'] == 0 || $arcRow['money'] > 0) { return TRUE; } - //强制转换非多站点模式,以便统一方式获得实际HTML文件 + //强制转换非多站点模式,以便统一方式获得实际网页文件 $GLOBALS['cfg_multi_site'] = 'N'; $arcurl = GetFileUrl( $arcRow['aid'], diff --git a/src/admin/inc/inc_list_functions.php b/src/admin/inc/inc_list_functions.php index b606edc9..160000ff 100644 --- a/src/admin/inc/inc_list_functions.php +++ b/src/admin/inc/inc_list_functions.php @@ -70,7 +70,7 @@ function CheckPic($picname) if ($picname != "") { return $picname; } else { - return '../static/web/img/thumbnail.jpg'; + return '/static/web/img/thumbnail.jpg'; } } //判断文档是否生成网页 diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index 7827fccb..df4dcd45 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -1,6 +1,6 @@ getUserType() >= 10) { - $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : " + $adminMenu1 = (DEDEBIZ_SAFE_MODE ? "" : " @@ -43,7 +43,7 @@ if ($cuserLogin->getUserType() >= 10) { ")." - ".(DEDEBIZ_SAFE_MODE? "" : "")." + ".(DEDEBIZ_SAFE_MODE ? "" : "")." @@ -64,21 +64,21 @@ if ($cuserLogin->getUserType() >= 10) { - ".(DEDEBIZ_SAFE_MODE? "" : "")." - ".(DEDEBIZ_SAFE_MODE? "" : "")." + ".(DEDEBIZ_SAFE_MODE ? "" : "")." + ".(DEDEBIZ_SAFE_MODE ? "" : "")." "; } $menusMain = " - + - - + + $addset @@ -94,7 +94,7 @@ $adminMenu1 - ".(DEDEBIZ_SAFE_MODE? "" : "")." + ".(DEDEBIZ_SAFE_MODE ? "" : "")." {$GLOBALS['menusMoudle']} diff --git a/src/admin/inc/inc_menu_func.php b/src/admin/inc/inc_menu_func.php index c571b1da..e9fd14e6 100644 --- a/src/admin/inc/inc_menu_func.php +++ b/src/admin/inc/inc_menu_func.php @@ -1,6 +1,6 @@ GetAtt('addalt'); - $link = "$link"; + $link = "$link"; } else { - $link .= ""; + $link .= ''; } $itemtmp = str_replace('~link~', $link, $itemTemplet); echo $itemtmp; diff --git a/src/admin/inc/inc_menu_module.php b/src/admin/inc/inc_menu_module.php index fcc792ab..c2adeaa0 100644 --- a/src/admin/inc/inc_menu_module.php +++ b/src/admin/inc/inc_menu_module.php @@ -1,6 +1,6 @@ SetQuery("SELECT * FROM `#@__plus` WHERE isshow=1 ORDER BY aid ASC"); $dsql->Execute(); while ($row = $dsql->GetObject()) { - $row->menustring = str_replace('plus_友情链接', 'plus_友情链接模块', $row->menustring); + $row->menustring = str_replace('', '', $row->menustring); $plusset .= $row->menustring."\r\n"; } $adminMenu = ''; if ($cuserLogin->getUserType() >= 10) { - $adminMenu = DEDEBIZ_SAFE_MODE? "" : " + $adminMenu = DEDEBIZ_SAFE_MODE ? "" : " "; diff --git a/src/admin/index.php b/src/admin/index.php index e668d235..ce7bf2c8 100644 --- a/src/admin/index.php +++ b/src/admin/index.php @@ -16,6 +16,9 @@ if (preg_match("#PHP (.*) Development Server#", $_SERVER['SERVER_SOFTWARE'])) { } require_once(dirname(__FILE__)."/config.php"); require_once(DEDEINC.'/dedetag.class.php'); +require(DEDEADMIN.'/inc/inc_menu.php'); +require(DEDEADMIN.'/inc/inc_menu_func.php'); +$openitem = (empty($openitem) ? 1 : $openitem); include(DEDEADMIN.'/templets/index.htm'); exit(); ?> \ No newline at end of file diff --git a/src/admin/index_body.php b/src/admin/index_body.php index c9915e31..8954e8d2 100644 --- a/src/admin/index_body.php +++ b/src/admin/index_body.php @@ -53,9 +53,10 @@ if (empty($dopost)) { if (trim($row['editcon']) == '') { $row['editcon'] = 'archives_edit.php'; } - $rowarcrank = $row['arcrank'] == -1? " 未审核" : ""; + $rowarcrank = $row['arcrank']==-1 ? '待审核' : '已审核'; $pubdate = GetDateMk($row['pubdate']); - echo ""; + $row['title'] = cn_substr($row['title'], 70); + echo ""; } } else { ?> @@ -66,7 +67,7 @@ if (empty($dopost)) { exit; } elseif ($dopost == "system_info") { if (empty(trim($cfg_auth_code))) { - $indexHTML = ""; + $indexHTML = ''; if (file_exists(DEDEROOT."/index.html")) { $indexHTML = file_get_contents(DEDEROOT."/index.html"); } else { diff --git a/src/admin/index_menu.php b/src/admin/index_menu.php deleted file mode 100644 index d1c5da8b..00000000 --- a/src/admin/index_menu.php +++ /dev/null @@ -1,16 +0,0 @@ - \ No newline at end of file diff --git a/src/admin/index_testenv.php b/src/admin/index_testenv.php index 84579964..735f79fd 100644 --- a/src/admin/index_testenv.php +++ b/src/admin/index_testenv.php @@ -129,13 +129,13 @@ if (!IsSSL()) { $safeMsg[] = '检测到网址非安全链接,建议您部署https'; } if (IsWritable(DEDEDATA.'/common.inc.php')) { - $safeMsg[] = '检测到data/common.inc.php数据库文件写入权限,建议您以管理员权限设置禁止写入和执行'; + $safeMsg[] = '检测到data/common.inc.php数据库配置文件权限可以写入,建议您权限设置禁止写入和执行'; } if (version_compare(PHP_VERSION, '5.3.0', '<')) { $safeMsg[] = '检测到php版本过低会无法正常使用后台,建议您升级到php8.x'; } if (preg_match("#[\\|/]admin[\\|/]#", $dirname)) { - $safeMsg[] = '检测到后台管理登录链接带admin,建议您进行修改'; + $safeMsg[] = '检测到后台管理目录名称中包含admin,强烈建议后台管理目录修改为其它名称'; } $rs = TestAdminPWD(); if ($rs < 0) { diff --git a/src/admin/js/search.js b/src/admin/js/search.js deleted file mode 100644 index 2015d5fe..00000000 --- a/src/admin/js/search.js +++ /dev/null @@ -1,23 +0,0 @@ -function selAll() { - var celements = document.getElementsByName('aids[]'); - for (i=0;i { - document.form3.dopost.value = 'delall'; - document.form3.submit(); - }).catch((e) => { - console.log(e); - }); -} \ No newline at end of file diff --git a/src/admin/js/user.js b/src/admin/js/user.js deleted file mode 100644 index 6bcb1e5a..00000000 --- a/src/admin/js/user.js +++ /dev/null @@ -1,53 +0,0 @@ -if (moz == null) { - var ie = document.all != null; - var moz = !ie && document.getElementById != null && document.layers == null; -} -function delArc(mid) { - var qstr=getCheckboxItem(); - if (mid==0) mid = getOneItem(); - location="member_do.php?id="+qstr+"&dopost=delmembers"; -} -function getCheckboxItem() { - var allSel=""; - if (document.form2.mid.value) return document.form2.mid.value; - for (i=0;iExecuteNoneQuery("DELETE FROM `#@__log` $dquery"); - ShowMsg("成功删除指定的日志", $bkurl); + ShowMsg("成功删除指定日志", $bkurl); exit(); } else { - ShowMsg("无法识别您的请求", "javascript:;"); + ShowMsg("系统无法识别请求", "log_list.php"); exit(); } ?> \ No newline at end of file diff --git a/src/admin/log_list.php b/src/admin/log_list.php index 2bab78cb..bb63e910 100644 --- a/src/admin/log_list.php +++ b/src/admin/log_list.php @@ -13,9 +13,9 @@ CheckPurview('sys_Log'); require_once(DEDEINC."/datalistcp.class.php"); require_once(DEDEINC."/common.func.php"); setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/"); -$sql = $where = ""; +$sql = $where = ''; if (empty($adminid)) $adminid = 0; -if (empty($cip)) $cip = ""; +if (empty($cip)) $cip = ''; if (empty($dtime)) $dtime = 0; if ($adminid > 0) $where .= " AND #@__log.adminid='$adminid' "; if ($cip != "") $where .= " AND #@__log.cip LIKE '%$cip%' "; @@ -25,7 +25,7 @@ if ($dtime > 0) { $where .= " AND #@__log.dtime>'$starttime' "; } $sql = "SELECT `#@__log`.*,`#@__admin`.userid FROM `#@__log` LEFT JOIN `#@__admin` ON `#@__admin`.id=`#@__log`.adminid WHERE 1=1 $where ORDER BY `#@__log`.lid DESC"; -$adminlist = ""; +$adminlist = ''; $dsql->SetQuery("SELECT id,uname FROM `#@__admin`"); $dsql->Execute('admin'); while ($myrow = $dsql->GetObject('admin')) { diff --git a/src/admin/login.php b/src/admin/login.php index 702d8771..85e08f49 100644 --- a/src/admin/login.php +++ b/src/admin/login.php @@ -30,7 +30,7 @@ if (is_dir(dirname(__FILE__).'/../install')) { //检测后台目录是否更名 $cururl = GetCurUrl(); if (preg_match('/admin/', $cururl)) { - $redmsg = '
后台管理目录名称中包含admin,强烈建议后台管理目录修改为其它名称
'; + $redmsg = '
检测到后台管理目录名称中包含admin,强烈建议后台管理目录修改为其它名称
'; } else { $redmsg = ''; } @@ -46,7 +46,7 @@ if ($dopost == 'login') { $svali = strtolower(GetCkVdValue()); if ($validate == '' || $validate != $svali) { ResetVdValue(); - ShowMsg('验证码不正确', 'login.php', 0, 1000); + ShowMsg('验证码不正确', 'login.php'); exit; } } @@ -62,16 +62,16 @@ if ($dopost == 'login') { } } else if ($res == -1) { ResetVdValue(); - ShowMsg('管理员账号错误', 'login.php', 0, 1000); + ShowMsg('管理员账号错误', 'login.php'); exit; } else { ResetVdValue(); - ShowMsg('管理员密码错误', 'login.php', 0, 1000); + ShowMsg('管理员密码错误', 'login.php'); exit; } } else { ResetVdValue(); - ShowMsg('管理员账号和密码没填完整', 'login.php', 0, 1000); + ShowMsg('管理员账号和密码没填完整', 'login.php'); exit; } } diff --git a/src/admin/makehtml_homepage.php b/src/admin/makehtml_homepage.php index 495150c6..6ea8af51 100644 --- a/src/admin/makehtml_homepage.php +++ b/src/admin/makehtml_homepage.php @@ -28,29 +28,29 @@ if ($dopost == "view") { if ($rs["admin_pwd_exists"] == "false") { //设定dedebiz admin密码 if ($dedebiz_admin == "" || $dedebiz_admin !== $re_dedebiz_admin) { - echo ""; - echo "
DedeBIZ操作密码为空或两次指定的密码不符

"; + echo ""; + echo "
密码不能为空或密码输入错误

"; $client->Close(); exit; } $data = $client->AdminPWDCreate($dedebiz_admin); if ($data->data != "ok") { - echo ""; - echo "
DedeBIZ设定操作密码失败:${$data}

"; + echo ""; + echo "
密码失败:${$data}

"; $client->Close(); exit; } } else { if ($dedebiz_admin == "") { - echo ""; - echo "
DedeBIZ操作密码为空

"; + echo ""; + echo "
密码不能为空

"; $client->Close(); exit; } $data = $client->AdminSetIndexLockState($dedebiz_admin, $lockindex); if ($data->data != "ok") { - echo ""; - echo "
DedeBIZ操作密码失败,填写正确的操作密码

"; + echo ""; + echo "
密码输入错误,请填写正确密码

"; $client->Close(); exit; } @@ -58,7 +58,7 @@ if ($dopost == "view") { } $client->Close(); } - $remotepos = empty($remotepos) ? '/index.html' : $remotepos; + $remotepos = empty($remotepos) ? '../index.html' : $remotepos; $serviterm = empty($serviterm) ? "" : $serviterm; if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($position))) { ShowMsg("文件扩展名已被系统禁止", "javascript:;"); @@ -85,7 +85,7 @@ if ($dopost == "view") { } else { //动态浏览 if (file_exists($homeFile)) @unlink($homeFile); - ShowMsg("更新动态首页,点击浏览", "javascript:;"); + ShowMsg("更新动态首页,点击浏览", "javascript:;"); } $iquery = "UPDATE `#@__homepageset` SET showmod='$showmod'"; $dsql->ExecuteNoneQuery($iquery); diff --git a/src/admin/makehtml_list_action.php b/src/admin/makehtml_list_action.php index ae14cd4e..9c4b9828 100644 --- a/src/admin/makehtml_list_action.php +++ b/src/admin/makehtml_list_action.php @@ -97,7 +97,7 @@ $nextpage = $pageno + 1; if ($nextpage >= $totalpage && $finishType) { if ($gotype == '') { if (empty($reurl)) { - $reurl = '../apps/list.php?tid='.$tid; + $reurl = '/apps/list.php?tid='.$tid; } ShowMsg("完成所有栏目更新,点击浏览", "javascript:;"); exit(); diff --git a/src/admin/makehtml_spec.php b/src/admin/makehtml_spec.php index de17518c..fa72521e 100644 --- a/src/admin/makehtml_spec.php +++ b/src/admin/makehtml_spec.php @@ -10,7 +10,7 @@ */ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_MakeHtml'); -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; if ($dopost == "ok") { require_once(DEDEINC."/archive/specview.class.php"); $sp = new SpecView(); diff --git a/src/admin/makehtml_taglist.php b/src/admin/makehtml_taglist.php index de13dfad..ce57a7a9 100644 --- a/src/admin/makehtml_taglist.php +++ b/src/admin/makehtml_taglist.php @@ -35,5 +35,5 @@ if ($action == "search") { echo json_encode($result); exit; } -include DedeInclude('templets/makehtml_taglist.htm'); +include DedeInclude('templets/makehtml_tag_list.htm'); ?> \ No newline at end of file diff --git a/src/admin/makehtml_taglist_action.php b/src/admin/makehtml_taglist_action.php index bd7f3cdb..6f593fb7 100644 --- a/src/admin/makehtml_taglist_action.php +++ b/src/admin/makehtml_taglist_action.php @@ -20,7 +20,7 @@ if (empty($maxpagesize)) $maxpagesize = 30; $startid = isset($startid) ? intval($startid) : 0; $endid = isset($endid) ? intval($endid) : 0; $tagid = isset($tagid) ? intval($tagid) : 0; -$tagsdir = str_replace("{cmspath}", $cfg_cmspath, $cfg_tags_dir); +$tagsdir = str_replace("{cmspath}", "", $cfg_tags_dir); //生成 if ($tagid > 0) { $upall = 0; //更新单个模式 @@ -50,10 +50,10 @@ if ($ctagid == 0 && $allfinish) { } $tag = $dsql->GetOne("SELECT * FROM `#@__tagindex` WHERE id='$ctagid' LIMIT 0,1;"); //创建TAGS目录 -$tagsDir = str_replace("{cmspath}",$cfg_cmspath,$cfg_tags_dir); +$tagsDir = str_replace("{cmspath}", "", $cfg_tags_dir); MkdirAll($cfg_basedir.$tagsDir, $cfg_dir_purview); if (is_array($tag) && count($tag) > 0) { - $dlist = new TagList($tag['id'], 'taglist.htm'); + $dlist = new TagList($tag['id'], 'tag_list.htm'); $dlist->CountRecord(); $dlist->SetTagsDir($tagsdir); $ntotalpage = $dlist->TotalPage; diff --git a/src/admin/media_add.php b/src/admin/media_add.php index 770d2605..22f08f48 100644 --- a/src/admin/media_add.php +++ b/src/admin/media_add.php @@ -10,7 +10,7 @@ */ require_once(dirname(__FILE__)."/config.php"); //添加权限检查 -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; //上传 if ($dopost == "upload") { CheckCSRF(); diff --git a/src/admin/media_edit.php b/src/admin/media_edit.php index 0106c5ba..b14b6296 100644 --- a/src/admin/media_edit.php +++ b/src/admin/media_edit.php @@ -11,13 +11,13 @@ require_once(dirname(__FILE__)."/config.php"); //权限检查 CheckPurview('sys_Upload,sys_MyUpload'); -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; $backurl = isset($_COOKIE['ENV_GOBACK_URL']) ? $_COOKIE['ENV_GOBACK_URL'] : "javascript:history.go(-1);"; //删除附件 if ($dopost == 'del') { CheckPurview('sys_DelUpload'); if (empty($ids)) { - $ids = ""; + $ids = ''; } if ($ids == "") { $myrow = $dsql->GetOne("SELECT url FROM `#@__uploads` WHERE aid='".$aid."'"); @@ -36,7 +36,7 @@ if ($dopost == 'del') { exit(); } else { $ids = explode(',', $ids); - $idquery = ""; + $idquery = ''; foreach ($ids as $aid) { if ($idquery == "") { $idquery .= " WHERE aid='$aid' "; @@ -72,7 +72,7 @@ else if ($dopost == 'save') { CheckPurview('sys_Upload'); } //检测文件类型 - $addquery = ""; + $addquery = ''; if (is_uploaded_file($upfile)) { if ($mediatype == 1) { $sparr = array("image/pjpeg", "image/jpeg", "image/gif", "image/png", "image/xpng", "image/wbmp"); @@ -130,7 +130,7 @@ else if ($dopost == 'save') { $imgw = 0; $imgh = 0; if ($mediatype == 1) { - $info = ""; + $info = ''; $sizes[0] = 0; $sizes[1] = 0; $sizes = @getimagesize($fullfilename, $info); diff --git a/src/admin/media_main.php b/src/admin/media_main.php index c45d79f2..b3fba2d6 100644 --- a/src/admin/media_main.php +++ b/src/admin/media_main.php @@ -23,7 +23,7 @@ if ($dopost == 'filemanager') { exit(); } //数据库管理 -if (empty($keyword)) $keyword = ""; +if (empty($keyword)) $keyword = ''; $addsql = " WHERE (u.title LIKE '%$keyword%' OR u.url LIKE '%$keyword%') "; if (empty($membertype)) { $membertype = 0; diff --git a/src/admin/member_do.php b/src/admin/member_do.php index bcfe750a..9e39907d 100644 --- a/src/admin/member_do.php +++ b/src/admin/member_do.php @@ -48,7 +48,7 @@ if ($dopost == "delmember") { $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE mid='$id' "); $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET mid='0' WHERE mid='$id'"); } else { - ShowMsg("无法删除此会员,如果这个会员是管理员,必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL, 0, 5000); + ShowMsg("无法删除此会员,如果这个会员是管理员,必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL); exit(); } } @@ -60,7 +60,7 @@ if ($dopost == "delmember") { $wintitle = "删除指定会员"; $wecome_info = "会员管理 - 删除会员"; $win = new OxWindow(); - $win->Init("member_do.php", "js/blank.js", "POST"); + $win->Init("member_do.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("fmdo", "yes"); $win->AddHidden("dopost", $dopost); $win->AddHidden("id", $id); @@ -95,7 +95,7 @@ if ($dopost == "delmember") { $dsql->ExecuteNoneQuery("DELETE FROM `#@__feedback` WHERE mid IN (".str_replace("`", ",", $id).") "); $dsql->ExecuteNoneQuery("UPDATE `#@__archives` SET mid='0' WHERE mid IN (".str_replace("`", ",", $id).")"); } else { - ShowMsg("无法删除此会员,如果这个会员是管理员关连的id,必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL, 0, 3000); + ShowMsg("无法删除此会员,如果这个会员是管理员关连的id,必须先删除这个管理员才能删除此帐号", $ENV_GOBACK_URL); exit(); } } @@ -107,14 +107,14 @@ if ($dopost == "delmember") { $wintitle = "删除指定会员"; $wecome_info = "会员管理 - 删除会员"; $win = new OxWindow(); - $win->Init("member_do.php", "js/blank.js", "POST"); + $win->Init("member_do.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("fmdo", "yes"); $win->AddHidden("dopost", $dopost); $win->AddHidden("id", $id); $win->AddHidden("randcode", $randcode); $win->AddHidden("safecode", $safecode); $win->AddTitle("您确定要删除id".$id."会员吗"); - $win->AddMsgItem("
"); + $win->AddMsgItem(""); $winform = $win->GetWindow("ok"); $win->Display(); } @@ -177,7 +177,7 @@ else if ($dopost == "memberlogin") { CheckPurview('member_Edit'); PutCookie('DedeUserID', $id, 1800); PutCookie('DedeLoginTime', time(), 1800); - if (empty($jumpurl)) header("location:../user/index.php"); + if (empty($jumpurl)) header("location:$cfg_memberurl/index.php"); else header("location:$jumpurl"); } else if ($dopost == "deoperations") { $nid = preg_replace('#[^0-9,]#', '', preg_replace('#`#', ',', $nid)); diff --git a/src/admin/member_toadmin.php b/src/admin/member_toadmin.php index 33524370..3971dc10 100644 --- a/src/admin/member_toadmin.php +++ b/src/admin/member_toadmin.php @@ -18,7 +18,7 @@ $row = array(); if ($dopost == "toadmin") { $pwd = trim($pwd); if ($pwd != '' && preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd)) { - ShowMsg('密码不合法,使用[0-9a-zA-Z_@!.-]范围以内字符', '-1', 0, 3000); + ShowMsg('密码不合法,请使用数字0-9小写a-z大写A-Z符号_@!.-', '-1'); exit(); } $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); diff --git a/src/admin/member_type.php b/src/admin/member_type.php index 6b3981fc..54495f70 100644 --- a/src/admin/member_type.php +++ b/src/admin/member_type.php @@ -10,7 +10,7 @@ */ require_once(dirname(__FILE__)."/config.php"); CheckPurview('member_Type'); -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; //保存修改 if ($dopost == "save") { $startID = 1; diff --git a/src/admin/module_main.php b/src/admin/module_main.php index 1601d3d5..6f5b3381 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -17,7 +17,7 @@ require_once(DEDEINC."/dedemodule.class.php"); require_once(DEDEINC."/libraries/oxwindow.class.php"); if (empty($action)) $action = ''; $mdir = DEDEDATA.'/module'; -$mdurl = ""; +$mdurl = ''; function TestWriteAble($d) { $tfile = '_dedet.txt'; @@ -67,7 +67,7 @@ if ($action == '') { $dm->Clear(); exit(); } else if ($action == 'view_developoer') { - //检验开发者信息 + //检验贡献者信息 $dm = new DedeModule($mdir); $info = $dm->GetModuleInfo($hash); if ($info == null) { @@ -80,7 +80,7 @@ if ($action == '') { $dhd->OpenUrl($devURL); $devContent = $dhd->GetHtml(); $devInfo = (array)json_decode($devContent); - $offUrl = ""; + $offUrl = ''; if ($devInfo['dev_type'] == 1) { $offUrl = "官方网址:{$devInfo['offurl']}
"; } @@ -89,7 +89,7 @@ if ($action == '') { $devInfo['dev_name'] = $info['team']."未认证"; $authAt = "未知"; } - ShowMsg("开发者名称:{$devInfo['dev_name']}
开发者id:{$devInfo['dev_id']}
认证于:{$authAt}", "-1"); + ShowMsg("贡献者名称:{$devInfo['dev_name']}
贡献者id:{$devInfo['dev_id']}
认证于:{$authAt}", "-1"); exit; } else if ($action == 'setup') { $dm = new DedeModule($mdir); @@ -98,7 +98,7 @@ if ($action == '') { ShowMsg("获取模块信息错误,模块文件错误", -1); exit; } - $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
该模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性'); + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
该模块的语言编码与您系统的编码不一致,请向贡献者确认它的兼容性'); $filelists = (array)$dm->GetFileLists($hash); $filelist = ''; $prvdirs = array(); @@ -138,7 +138,7 @@ if ($action == '') { } $prvdir .= "
".$ctag->GetAtt('itemname').""; + $formitem = ''; + $formitem .= "
".$ctag->GetAtt('itemname').""; $formitem .= GetEditor($fieldname, '', 350, 'Basic', 'string'); $formitem .= "
\r\n"; return $formitem; @@ -109,14 +109,13 @@ function GetFormItem($ctag) return $formitem; } else { if ($ctag->GetAtt('default') != "") $dfvalue = $ctag->GetAtt('default'); - else $dfvalue = ""; + else $dfvalue = ''; $innertext = "\r\n"; $formitem = str_replace("~name~", $ctag->GetAtt('itemname'), $formitem); $formitem = str_replace("~form~", $innertext, $formitem); return $formitem; } } - /** * 处理不同类型的数据 * @@ -154,7 +153,7 @@ function GetFieldValue($dvalue, $dtype, $aid = 0, $job = 'add', $addvar = '') fclose($fp); return $addvar; } else { - $ipath = $GLOBALS['cfg_cmspath']."/data/textdata"; + $ipath = '/data/textdata'; $tpath = ceil($aid / 5000); if (!is_dir($GLOBALS['cfg_basedir'].$ipath)) { MkdirAll($GLOBALS['cfg_basedir'].$ipath, $cfg_dir_purview); @@ -178,7 +177,7 @@ function GetFieldValue($dvalue, $dtype, $aid = 0, $job = 'add', $addvar = '') $imgurl = "{dede:img text='' width='' height=''} ".$iurl." {/dede:img}"; if (preg_match("#^(http|https):\/\/#i", $iurl) && $GLOBALS['isUrlOpen']) { //远程图片 - $reimgs = ""; + $reimgs = ''; if ($isUrlOpen) { $reimgs = GetRemoteImage($iurl, $GLOBALS['adminid']); if (is_array($reimgs)) { @@ -200,7 +199,6 @@ function GetFieldValue($dvalue, $dtype, $aid = 0, $job = 'add', $addvar = '') return $dvalue; } } - /** * 获得带值的表单修改时用 * @@ -212,10 +210,10 @@ function GetFieldValue($dvalue, $dtype, $aid = 0, $job = 'add', $addvar = '') function GetFormItemValue($ctag, $fvalue) { $fieldname = $ctag->GetName(); - $formitem = " + $formitem = "
- - + +
~name~~form~~name~~form~
\r\n"; $innertext = trim($ctag->GetInnerText()); @@ -245,7 +243,7 @@ function GetFormItemValue($ctag, $fvalue) $v = trim($v); if ($v != '') { if ($fvalue == $v) { - $myformItem .= "\r\n"; + $myformItem .= "\r\n"; } else { $myformItem .= "\r\n"; } @@ -265,21 +263,21 @@ function GetFormItemValue($ctag, $fvalue) if ($ctag->GetAtt("type") == "textdata") { if (is_file($GLOBALS['cfg_basedir'].$fvalue)) { $fp = fopen($GLOBALS['cfg_basedir'].$fvalue, 'r'); - $okfvalue = ""; + $okfvalue = ''; while (!feof($fp)) { $okfvalue .= fgets($fp, 1024); } fclose($fp); } else { - $okfvalue = ""; + $okfvalue = ''; } - $formitem = "\r\n"; + $formitem = "
".$ctag->GetAtt('itemname')."
\r\n"; $formitem .= "\r\n"; $formitem .= "
".$ctag->GetAtt('itemname')."\r\n".GetEditor($fieldname, $okfvalue, 350, 'Basic', 'string')."
\r\n"; $formitem .= "\r\n"; return $formitem; } else if ($ctag->GetAtt("type") == "htmltext") { - $formitem = "\r\n"; + $formitem = "
".$ctag->GetAtt('itemname')."
\r\n"; $formitem .= "\r\n"; $formitem .= "
".$ctag->GetAtt('itemname')."\r\n".GetEditor($fieldname, $fvalue, 350, 'Basic', 'string')."
\r\n"; return $formitem; diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php index 4c85e9e9..eed4053a 100644 --- a/src/admin/inc/inc_archives_functions.php +++ b/src/admin/inc/inc_archives_functions.php @@ -1,6 +1,6 @@ 记忆的列表页" : ''; if (!isset($_NOT_ARCHIVES)) { require_once(DEDEINC.'/customfields.func.php'); } @@ -136,7 +134,7 @@ function GetCurContent($body) } else { continue; } - $milliSecondN = dd2char($milliSecond.mt_rand(1000,8000)); + $milliSecondN = dd2char($milliSecond.mt_rand(1000, 9999)); $value = trim($value); $rndFileName = $imgPath.'/'.$milliSecondN.'-'.$key.$itype; $fileurl = $imgUrl.'/'.$milliSecondN.'-'.$key.$itype; @@ -198,7 +196,7 @@ function GetRemoteImage($url, $uid = 0) } else { $itype = '.jpg'; } - $rndname = dd2char($uid.'_'.MyDate('mdHis', time()).mt_rand(1000,9999)); + $rndname = dd2char($uid.'_'.MyDate('mdHis', time()).mt_rand(1000, 9999)); $rndtrueName = $imgPath.'/'.$rndname.$itype; $fileurl = $imgUrl.'/'.$rndname.$itype; $ok = $htd->SaveToBin($rndtrueName); @@ -357,7 +355,7 @@ function GetDDImage($litpic, $picname, $isremote) } $savepath = $cfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000,9999)); + $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999)); if (strtolower($_FILES[$litpic]['type']) == "image/gif") { $fullUrl = $fullUrl.".gif"; } else if (strtolower($_FILES[$litpic]['type']) == "image/png") { @@ -484,7 +482,7 @@ function PrintAutoFieldsEdit(&$fieldset, &$fieldValues, $loadtype = 'all') $dtp = new DedeTagParse(); $dtp->SetNameSpace("field", "<", ">"); $dtp->LoadSource($fieldset); - $dede_addonfields = ""; + $dede_addonfields = ''; if (is_array($dtp->CTags)) { foreach ($dtp->CTags as $tid => $ctag) { if ( @@ -679,7 +677,7 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '') } else { $savepath = $cfg_image_dir.'/'.date("%Y-%m", $ntime); CreateDir($savepath); - $fullUrl = $savepath.'/'.date("%d", $ntime).dd2char(date("%H%M%S", $ntime).'0'.$cuserLogin->getUserID().'0'.mt_rand(1000,9999)); + $fullUrl = $savepath.'/'.date("%d", $ntime).dd2char(date("%H%M%S", $ntime).'0'.$cuserLogin->getUserID().'0'.mt_rand(1000, 9999)); } if (strtolower($_FILES[$upname]['type']) == "image/gif") { $fullUrl = $fullUrl.".gif"; @@ -712,7 +710,7 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '') if ($isremote == 1 && preg_match("#^http[s]?:\/\/#i", $handurl)) { $ddinfos = GetRemoteImage($handurl, $cuserLogin->getUserID()); if (!is_array($ddinfos)) { - $litpic = ""; + $litpic = ''; } else { $filename = $ddinfos[0]; } @@ -724,7 +722,7 @@ function UploadOneImage($upname, $handurl = '', $isremote = 1, $ntitle = '') } $imgfile = $cfg_basedir.$filename; if (is_file($imgfile) && $isrm_up && $filename != '') { - $info = ""; + $info = ''; $imginfos = GetImageSize($imgfile, $info); //把新上传的图片信息保存到媒体文档管理文档中 $inquery = "INSERT INTO `#@__uploads` (title,url,mediatype,width,height,playtime,filesize,uptime,mid) VALUES ('$title','$filename','1','".$imginfos[0]."','".$imginfos[1]."','0','".filesize($imgfile)."','".time()."','".$cuserLogin->getUserID()."');"; @@ -748,9 +746,9 @@ function GetUpdateTest() if ($cfg_make_andcat == 'Y') $dolist .= empty($dolist) ? 'makeparenttype' : ',makeparenttype'; $dolists = explode(',', $dolist); $jumpUrl = "task_do.php?typeid={$typeid}&aid={$arcID}&dopost={$dolists[0]}&nextdo=".preg_replace("#".$dolists[0]."[,]{0,1}#", '', $dolist); - $revalue = "\r\n"; - $revalue .= "\r\n"; - $revalue .= "
正在进行相关文档更新,未完成前不要执行其它操作:\r\n
\r\n\r\n
"; + $revalue = "
"; + $revalue .= "
"; + $revalue .= "
{$row['title']}{$rowarcrank}{$pubdate}
{$row['title']}{$rowarcrank}{$pubdate}
验证安全码: (安全码:$safecode)
验证安全码: (安全码:$safecode)
"; $win = new OxWindow(); - $win->Init("module_main.php", "js/blank.js", "post"); + $win->Init("module_main.php", "/static/web/js/admin.blank.js", "post"); $wecome_info = "模块管理 - 安装{$infos['name']}"; $devURL = DEDECDNURL."/developers/{$infos['dev_id']}.json"; $dhd = new DedeHttpDown(); @@ -169,7 +169,7 @@ if ($action == '') { {$infos['filesize']} - 开发者id: + 贡献者id: {$infos['dev_id']} {$s} @@ -181,7 +181,7 @@ if ($action == '') { 浏览 - 目录权限说明:
../为根目录
./表示当前目录 + 目录权限说明:
/为根目录
./表示当前目录 $prvdir @@ -191,7 +191,7 @@ if ($action == '') { 对于已存在文件处理方法: - + @@ -224,7 +224,7 @@ if ($action == '') { if (!isset($autodel) || $autodel == 0) $dm->WriteSystemFile($hash, 'uninstall'); $dm->WriteSystemFile($hash, 'readme'); $dm->Clear(); - //用模块的程序安装安装 + //用模块的程序安装 if (!isset($autosetup) || $autosetup == 0) { include(DEDEDATA.'/module/'.$filename); exit(); @@ -240,8 +240,7 @@ if ($action == '') { $setupsql = preg_replace("#TYPE=MyISAM#i", $sql41tmp, $setupsql); } //_ROOTURL_ - if ($cfg_cmspath == '/') $cfg_cmspath = ''; - $rooturl = $cfg_basehost.$cfg_cmspath; + $rooturl = $cfg_basehost; $setupsql = preg_replace("#_ROOTURL_#i", $rooturl, $setupsql); $setupsql = preg_replace("#[\r\n]{1,}#", "\n", $setupsql); $sqls = preg_split('/;[ \t]{0,}\n/', $setupsql); @@ -261,10 +260,10 @@ if ($action == '') { } else if ($action == 'del') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); - $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
该模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性'); + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
该模块的语言编码与您系统的编码不一致,请向贡献者确认它的兼容性'); $dev_id = empty($infos['dev_id'])? "未认证" : "{$infos['dev_id']} 已认证"; $win = new OxWindow(); - $win->Init("module_main.php", "js/blank.js", "post"); + $win->Init("module_main.php", "/static/web/js/admin.blank.js", "post"); $wecome_info = "模块管理 - 删除{$infos['name']}"; $win->AddHidden("hash", $hash); $win->AddHidden("action", "delok"); @@ -281,7 +280,7 @@ if ($action == '') { {$infos['filesize']} - 开发者id: + 贡献者id: {$dev_id} @@ -310,7 +309,7 @@ if ($action == '') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); if ($infos['url'] == '') $infos['url'] = ' '; - $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
该模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性'); + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
该模块的语言编码与您系统的编码不一致,请向贡献者确认它的兼容性'); $filelists = (array)$dm->GetFileLists($hash); $filelist = ''; foreach ($filelists as $v) { @@ -321,7 +320,7 @@ if ($action == '') { } $dev_id = empty($infos['dev_id'])? "未认证" : "{$infos['dev_id']} 已认证"; $win = new OxWindow(); - $win->Init("module_main.php", "js/blank.js", "post"); + $win->Init("module_main.php", "/static/web/js/admin.blank.js", "post"); $wecome_info = "模块管理 - 卸载{$infos['name']}"; $win->AddHidden("hash", $hash); $win->AddHidden("action", 'uninstallok'); @@ -338,7 +337,7 @@ if ($action == '') { {$infos['filesize']} - 开发者id: + 贡献者id: {$dev_id} @@ -356,7 +355,7 @@ if ($action == '') { 对于模块的文件处理方法: - + "; @@ -405,7 +404,7 @@ if ($action == '') { $msg = preg_replace("/<\/body>(.*)/isU", "", $msg); $dm->Clear(); $win = new OxWindow(); - $win->Init("module_main.php", "js/blank.js", "post"); + $win->Init("module_main.php", "/static/web/js/admin.blank.js", "post"); $wecome_info = "模块管理 - 使用说明"; $win->AddMsgItem("$msg"); $winform = $win->GetWindow("hand"); @@ -415,7 +414,7 @@ if ($action == '') { $dm = new DedeModule($mdir); $infos = $dm->GetModuleInfo($hash); if ($infos['url'] == '') $infos['url'] = ' '; - $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
该模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性'); + $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '
该模块的语言编码与您系统的编码不一致,请向贡献者确认它的兼容性'); $filelists = (array)$dm->GetFileLists($hash); $filelist = ''; $setupinfo = ''; @@ -439,9 +438,9 @@ if ($action == '') { } else { $setupinfo = "未安装 安装"; } - $dev_id = empty($infos['dev_id'])? "安装{$s}" : "{$infos['dev_id']} 安装{$s}"; + $dev_id = empty($infos['dev_id'])? "安装{$s}" : "{$infos['dev_id']} 安装{$s}"; $win = new OxWindow(); - $win->Init("", "js/blank.js", ""); + $win->Init("", "/static/web/js/admin.blank.js", ""); $wecome_info = "模块管理 - {$infos['name']}"; $msg = " 模块名称: @@ -456,7 +455,7 @@ if ($action == '') { {$infos['filesize']} - 开发者id: + 贡献者id: {$dev_id} diff --git a/src/admin/module_make.php b/src/admin/module_make.php index 0af091f5..1c96a6e6 100644 --- a/src/admin/module_make.php +++ b/src/admin/module_make.php @@ -24,14 +24,14 @@ if ($action == '') { //生成项目 else if ($action == 'make') { require_once(DEDEINC.'/libraries/dedehttpdown.class.php'); - //校验私钥,确定开发者身份 + //校验私钥,确定贡献者身份 $devURL = DEDECDNURL."/developers/$dev_id.json"; $dhd = new DedeHttpDown(); $dhd->OpenUrl($devURL); $devContent = $dhd->GetHtml(); $devInfo = (array)json_decode($devContent); if (($devInfo['auth_at'] + 60 * 60 * 24 * 365) < time()) { - ShowMsg("您的开发者账号已经过期,登录DedeBIZ官网申请续费", "-1"); + ShowMsg("您贡献者账号已经过期,登录DedeBIZ官网申请续费", "-1"); exit(); } $filelist = str_replace("\r", "\n", trim($filelist)); @@ -41,11 +41,11 @@ else if ($action == 'make') { exit(); } if (empty($dev_id)) { - ShowMsg("开发者id不能为空", "-1"); + ShowMsg("贡献者id不能为空", "-1"); exit(); } if (empty($priv)) { - ShowMsg("请填写开发者私钥信息", "-1"); + ShowMsg("请填写贡献者私钥信息", "-1"); exit(); } if (strlen($modulname) > 150) { @@ -63,7 +63,7 @@ else if ($action == 'make') { openssl_public_decrypt($encotent, $decontent, $devInfo['pub_key']); $minfo = (array)json_decode($decontent); if ($minfo['module_name'] != $modulname || $minfo['dev_id'] != $devInfo['dev_id']) { - ShowMsg("开发者私钥校验失败,请确保填写正确的开发者私钥", "-1"); + ShowMsg("贡献者私钥校验失败,请确保填写正确的贡献者私钥", "-1"); exit(); } //去除转义 @@ -174,21 +174,21 @@ else if ($action == 'edit') { exit(); } if (empty($dev_id)) { - ShowMsg("开发者id不能为空", "-1"); + ShowMsg("贡献者id不能为空", "-1"); exit(); } if (empty($priv)) { - ShowMsg("请填写开发者私钥信息", "-1"); + ShowMsg("请填写贡献者私钥信息", "-1"); exit(); } - //校验私钥,确定开发者身份 + //校验私钥,确定贡献者身份 $devURL = DEDECDNURL."/developers/$dev_id.json"; $dhd = new DedeHttpDown(); $dhd->OpenUrl($devURL); $devContent = $dhd->GetHtml(); $devInfo = (array)json_decode($devContent); if (($devInfo['auth_at'] + 60 * 60 * 24 * 365) < time()) { - ShowMsg("您的开发者账号已经过期,请登录www.dedebiz.com重新申请", "-1"); + ShowMsg("您贡献者账号已经过期,请登录www.dedebiz.com重新申请", "-1"); exit(); } if (strlen($modulname) > 150) { @@ -206,7 +206,7 @@ else if ($action == 'edit') { openssl_public_decrypt($encotent, $decontent, $devInfo['pub_key']); $minfo = (array)json_decode($decontent); if ($minfo['module_name'] != $modulname || $minfo['dev_id'] != $devInfo['dev_id']) { - ShowMsg("开发者私钥校验失败,请确保填写正确的开发者私钥", "-1"); + ShowMsg("贡献者私钥校验失败,请确保填写正确的贡献者私钥", "-1"); exit(); } //已经去除转义 diff --git a/src/admin/module_upload.php b/src/admin/module_upload.php index 3beda2e6..b1ea8005 100644 --- a/src/admin/module_upload.php +++ b/src/admin/module_upload.php @@ -19,7 +19,7 @@ if (empty($action)) $action = ''; $mdir = DEDEDATA.'/module'; if ($action == 'upload') { if (!is_uploaded_file($upfile)) { - ShowMsg("请选择上传的模块插件文件", "javascript:;"); + ShowMsg("请选择上传的模块插件文件", "-1"); exit(); } else { include_once(DEDEINC."/libraries/zip.class.php"); @@ -30,7 +30,7 @@ if ($action == 'upload') { if (empty($infos['hash'])) { unlink($tmpfilename); $dm->Clear(); - ShowMsg("您上传的插件不是正常模块格式文件", "javascript:;"); + ShowMsg("您上传的插件不是正常模块格式文件", "-1"); exit(); } if (preg_match("#[^0-9a-zA-Z]#", $infos['hash'])) { @@ -40,25 +40,25 @@ if ($action == 'upload') { if ($dm->HasModule($infos['hash']) && empty($delhas)) { unlink($tmpfilename); $dm->Clear(); - ShowMsg("您上传的模块已存在,请删除原模块文件或强制同名模块上传", "javascript:;"); + ShowMsg("您上传的模块已存在,请删除原模块文件或强制同名模块上传", "-1"); exit(); } @unlink($okfile); copy($tmpfilename, $okfile); @unlink($tmpfilename); $dm->Clear(); - ShowMsg("成功上传一个新的模块", "module_main.php?action=view&hash={$infos['hash']}"); + ShowMsg("成功上传一个新模块", "module_main.php?action=view&hash={$infos['hash']}"); exit(); } } else { $win = new OxWindow(); - $win->Init("module_upload.php", "js/blank.js", "POST' enctype='multipart/form-data"); + $win->Init("module_upload.php", "/static/web/js/admin.blank.js", "POST' enctype='multipart/form-data"); $wecome_info = "模块管理 - 上传模块插件"; $win->AddTitle('请选择上传的模块插件文件'); $win->AddHidden("action", 'upload'); $msg = " 文件格式: - + 已有模块: diff --git a/src/admin/mychannel_add.php b/src/admin/mychannel_add.php index 271e09d9..e353493e 100644 --- a/src/admin/mychannel_add.php +++ b/src/admin/mychannel_add.php @@ -47,15 +47,15 @@ if ($action == 'add') { //是否需要摘要字段 $dsql->ExecuteNoneQuery("DROP TABLE IF EXISTS `{$trueTable2}`;"); if ($issystem != -1) { - $tabsql = "CREATE TABLE `$trueTable2` (`aid` int(11) NOT NULL default '0',`typeid` int(11) NOT NULL default '0',`redirecturl` varchar(255) NOT NULL default '',`templet` varchar(30) NOT NULL default '',`userip` char(48) NOT NULL default '',"; + $tabsql = "CREATE TABLE `$trueTable2` (`aid` int(11) NOT NULL DEFAULT '0',`typeid` int(11) NOT NULL DEFAULT '0',`redirecturl` varchar(255) NOT NULL DEFAULT '',`templet` varchar(30) NOT NULL DEFAULT '',`userip` char(48) NOT NULL DEFAULT '',"; } else { - $tabsql = "CREATE TABLE `$trueTable2` (`aid` int(11) NOT NULL default '0',`typeid` int(11) NOT NULL default '0',`channel` SMALLINT NOT NULL DEFAULT '0',`arcrank` SMALLINT NOT NULL DEFAULT '0',`mid` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0',`click` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0',`title` varchar(255) NOT NULL default '',`senddate` int(11) NOT NULL default '0',`flag` set('c','h','p','f','s','j','a','b') default NULL,`litpic` varchar(60) NOT NULL default '',`userip` char(48) NOT NULL default '',`lastpost` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0',`scores` MEDIUMINT( 8 ) NOT NULL DEFAULT '0',`goodpost` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0',`badpost` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0', + $tabsql = "CREATE TABLE `$trueTable2` (`aid` int(11) NOT NULL DEFAULT '0',`typeid` int(11) NOT NULL DEFAULT '0',`channel` SMALLINT NOT NULL DEFAULT '0',`arcrank` SMALLINT NOT NULL DEFAULT '0',`mid` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',`click` INT(10) UNSIGNED NOT NULL DEFAULT '0',`title` varchar(255) NOT NULL DEFAULT '',`senddate` int(11) NOT NULL DEFAULT '0',`flag` set('c','h','p','f','s','j','a','b') DEFAULT NULL,`litpic` varchar(60) NOT NULL DEFAULT '',`userip` char(48) NOT NULL DEFAULT '',`lastpost` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0',`scores` MEDIUMINT(8) NOT NULL DEFAULT '0',`goodpost` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',`badpost` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', "; } if ($mysql_version < 4.1) { - $tabsql .= "PRIMARY KEY (`aid`), KEY `typeid` (`typeid`)\r\n) TYPE=MyISAM;"; + $tabsql .= " PRIMARY KEY (`aid`), KEY `typeid` (`typeid`)\r\n) TYPE=MyISAM; "; } else { - $tabsql .= "PRIMARY KEY (`aid`), KEY `typeid` (`typeid`)\r\n) ENGINE=MyISAM DEFAULT CHARSET=".$cfg_db_language.";"; + $tabsql .= " PRIMARY KEY (`aid`), KEY `typeid` (`typeid`)\r\n) ENGINE=MyISAM DEFAULT CHARSET=".$cfg_db_language."; "; } $rs = $dsql->ExecuteNoneQuery($tabsql); if (!$rs) { @@ -74,7 +74,7 @@ if ($action == 'add') { - + diff --git a/src/admin/mychannel_edit.php b/src/admin/mychannel_edit.php index b7e44f76..57947161 100644 --- a/src/admin/mychannel_edit.php +++ b/src/admin/mychannel_edit.php @@ -15,14 +15,14 @@ if (DEDEBIZ_SAFE_MODE) { CheckPurview('c_Edit'); require_once(DEDEINC."/dedetag.class.php"); require_once(DEDEINC."/libraries/oxwindow.class.php"); -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; $id = isset($id) && is_numeric($id) ? $id : 0; if ($dopost == "show") { $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET isshow=1 WHERE id='$id' "); ShowMsg("启用一个文档模型", "mychannel_main.php"); exit(); } else if ($dopost == "hide") { - $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET isshow=0 WHERE id='$id'"); + $dsql->ExecuteNoneQuery("UPDATE `#@__channeltype` SET isshow=0 WHERE id='$id' "); ShowMsg("隐藏一个文档模型", "mychannel_main.php"); exit(); } else if ($dopost == "copystart") { @@ -50,7 +50,7 @@ if ($dopost == "show") { $wintitle = "复制指定文档模型"; $wecome_info = "文档模型管理 - 复制文档模型"; $win = new OxWindow(); - $win->Init("mychannel_edit.php", "js/blank.js", "post"); + $win->Init("mychannel_edit.php", "/static/web/js/admin.blank.js", "post"); $win->AddTitle("复制文档模型:".$row['typename'].""); $win->AddHidden("cid", $id); $win->AddHidden("id", $id); @@ -74,7 +74,7 @@ if ($dopost == "show") { 复制模板: - + "; @@ -100,14 +100,14 @@ if ($dopost == "show") { $win = new OxWindow(); $win->Init(); $win->AddTitle("导出{$row['typename']}文档模型规则"); - $winform = $win->GetWindow("hand", ""); + $winform = $win->GetWindow("hand", ""); $win->Display(); exit(); } else if ($dopost == "exportin") { $wintitle = "导入指定文档模型规则"; $wecome_info = "文档模型管理 - 导入文档模型规则"; $win = new OxWindow(); - $win->Init("mychannel_edit.php", "js/blank.js", "post"); + $win->Init("mychannel_edit.php", "/static/web/js/admin.blank.js", "post"); $win->AddHidden("dopost", "exportinok"); $win->AddMsgItem(""); $winform = $win->GetWindow("ok"); @@ -136,7 +136,7 @@ if ($dopost == "show") { 文档模型规则出错 - + "); $fields = array(); foreach ($dtp->CTags as $ctag) { @@ -148,7 +148,7 @@ if ($dopost == "show") { 文档模型规则出错 - + "); } //正常的导入过程 @@ -159,19 +159,19 @@ if ($dopost == "show") { 已经存在相同的{$fields['nid']}模型 - + "); } //创建表 if ($fields['issystem'] != -1) { - $tabsql = "CREATE TABLE IF NOT EXISTS `{$fields['addtable']}` (`aid` int(11) NOT NULL default '0',`typeid` int(11) NOT NULL default '0',`redirecturl` varchar(255) NOT NULL default '',`templet` varchar(30) NOT NULL default '',`userip` char(46) NOT NULL default '',"; + $tabsql = "CREATE TABLE IF NOT EXISTS `{$fields['addtable']}` (`aid` int(11) NOT NULL DEFAULT '0',`typeid` int(11) NOT NULL DEFAULT '0',`redirecturl` varchar(255) NOT NULL DEFAULT '',`templet` varchar(30) NOT NULL DEFAULT '',`userip` char(46) NOT NULL DEFAULT '',"; } else { - $tabsql = "CREATE TABLE IF NOT EXISTS `{$fields['addtable']}`(`aid` int(11) NOT NULL default '0',`typeid` int(11) NOT NULL default '0',`channel` SMALLINT NOT NULL DEFAULT '0',`arcrank` SMALLINT NOT NULL DEFAULT '0',`mid` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0',`click` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0',`title` varchar(255) NOT NULL default '',`senddate` int(11) NOT NULL default '0',`flag` set('c','h','p','f','s','j','a','b') default NULL,"; + $tabsql = "CREATE TABLE IF NOT EXISTS `{$fields['addtable']}` (`aid` int(11) NOT NULL DEFAULT '0',`typeid` int(11) NOT NULL DEFAULT '0',`channel` SMALLINT NOT NULL DEFAULT '0',`arcrank` SMALLINT NOT NULL DEFAULT '0',`mid` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',`click` INT(10) UNSIGNED NOT NULL DEFAULT '0',`title` varchar(255) NOT NULL DEFAULT '',`senddate` int(11) NOT NULL DEFAULT '0',`flag` set('c','h','p','f','s','j','a','b') DEFAULT NULL,"; } if ($mysql_version < 4.1) { - $tabsql .= "PRIMARY KEY (`aid`), KEY `typeid` (`typeid`)\r\n) TYPE=MyISAM;"; + $tabsql .= " PRIMARY KEY (`aid`), KEY `typeid` (`typeid`)\r\n) TYPE=MyISAM; "; } else { - $tabsql .= "PRIMARY KEY (`aid`), KEY `typeid` (`typeid`)\r\n) ENGINE=MyISAM DEFAULT CHARSET=".$cfg_db_language.";"; + $tabsql .= " PRIMARY KEY (`aid`), KEY `typeid` (`typeid`)\r\n) ENGINE=MyISAM DEFAULT CHARSET=".$cfg_db_language."; "; } $rs = $dsql->ExecuteNoneQuery($tabsql); if (!$rs) { @@ -179,7 +179,7 @@ if ($dopost == "show") { 创建数据表失败:{$dsql->GetError()} - + "); exit(); } @@ -193,13 +193,13 @@ if ($dopost == "show") { } $fieldset = $fields['fieldset']; $fields['fieldset'] = addslashes($fields['fieldset']); - $inquery = "INSERT INTO `#@__channeltype` (`id`,`nid`,`typename`,`addtable`,`addcon`,`mancon`,`editcon`,`useraddcon`,`usermancon`,`usereditcon`,`fieldset`,`listfields`,`issystem`,`isshow`,`issend`,`arcsta`,`usertype`,`sendrank`) VALUES ('{$fields['newid']}','{$fields['nid']}','{$fields['typename']}','{$fields['addtable']}','{$fields['addcon']}','{$fields['mancon']}','{$fields['editcon']}','{$fields['useraddcon']}','{$fields['usermancon']}','{$fields['usereditcon']}','{$fields['fieldset']}','{$fields['listfields']}','{$fields['issystem']}','{$fields['isshow']}','{$fields['issend']}','{$fields['arcsta']}','{$fields['usertype']}','{$fields['sendrank']}' ); "; + $inquery = "INSERT INTO `#@__channeltype` (`id`,`nid`,`typename`,`addtable`,`addcon`,`mancon`,`editcon`,`useraddcon`,`usermancon`,`usereditcon`,`fieldset`,`listfields`,`issystem`,`isshow`,`issend`,`arcsta`,`usertype`,`sendrank`) VALUES ('{$fields['newid']}','{$fields['nid']}','{$fields['typename']}','{$fields['addtable']}','{$fields['addcon']}','{$fields['mancon']}','{$fields['editcon']}','{$fields['useraddcon']}','{$fields['usermancon']}','{$fields['usereditcon']}','{$fields['fieldset']}','{$fields['listfields']}','{$fields['issystem']}','{$fields['isshow']}','{$fields['issend']}','{$fields['arcsta']}','{$fields['usertype']}','{$fields['sendrank']}'); "; $rs = $dsql->ExecuteNoneQuery($inquery); if (!$rs) GotoStaMsg(" 导入文档模型时发生错误:{$dsql->GetError()} - + "); $dtp = new DedeTagParse(); $dtp->SetNameSpace("field", "<", ">"); @@ -219,7 +219,7 @@ if ($dopost == "show") { if ($islist != '') { $allfields .= ($allfields == '' ? $fieldname : ','.$fieldname); } - $dsql->ExecuteNoneQuery(" ALTER TABLE `{$fields['addtable']}` ADD $ntabsql "); + $dsql->ExecuteNoneQuery(" ALTER TABLE `{$fields['addtable']}` ADD $ntabsql "); } } if ($allfields != '') { @@ -229,7 +229,7 @@ if ($dopost == "show") { 成功导入一个文档模型 - + "); } else if ($dopost == "copysave") { $cid = intval($cid); @@ -289,7 +289,7 @@ if ($dopost == "show") { $wintitle = "查看模型应用模板"; $wecome_info = "文档模型管理 - 模型应用模板"; $win = new OxWindow(); - $win->Init("", "js/blank.js", ""); + $win->Init("", "/static/web/js/admin.blank.js", ""); $win->AddTitle("栏目".$row['typename']."默认模板文件说明"); $defaulttemplate = $cfg_templets_dir.'/'.$cfg_df_style; $msg = " @@ -321,14 +321,14 @@ if ($dopost == "show") { ShowMsg("系统文档模型不允许删除", "mychannel_main.php"); exit(); } - if (empty($job)) $job = ""; + if (empty($job)) $job = ''; //确认提示 if ($job == "") { require_once(DEDEINC."/libraries/oxwindow.class.php"); $wintitle = "删除指定文档模型"; $wecome_info = "文档模型管理 - 删除文档模型"; $win = new OxWindow(); - $win->Init("mychannel_edit.php", "js/blank.js", "POST"); + $win->Init("mychannel_edit.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("job", "yes"); $win->AddHidden("dopost", $dopost); $win->AddHidden("id", $id); @@ -429,7 +429,7 @@ if ($dopost == "show") { $label = $ctag->GetAtt('itemname'); if (in_array($datatype, $searchtype)) { $checked = in_array($value, $addonfieldsarr) ? 'checked' : ''; - $addonfields .= " "; + $addonfields .= " "; } } } @@ -441,7 +441,7 @@ if ($dopost == "show") { $addonfields = ''; } $template = trim($template); - $forms = ""; + $forms = ""; $forms .= ""; $forms .= ""; $forms .= "
"; @@ -531,7 +531,7 @@ if ($dopost == "show") { } else if ($type == 'radio') { $values = explode(',', $valuearr[$k]); if (is_array($values) && !empty($values)) { - $forms .= "$itemname:
"; + $forms .= "$itemname:
"; foreach ($values as $value) { $forms .= ""; } @@ -558,14 +558,14 @@ if ($dopost == "show") { $query = "REPLACE INTO `#@__advancedsearch` (mid, maintable, mainfields, addontable, addonfields, forms, template) VALUES ('$mid','$maintable','$mainstring','$addontable','$addonstring','$formssql', '$template')"; $dsql->ExecuteNoneQuery($query); $formshtml = dede_htmlspecialchars($forms); - echo ' - - - - - - - '; + echo ' + + + + + + + '; echo ""; echo "

下面生成的网页表单,根据自己需求修改样式后粘贴到对应的模板中

"; echo "
"; diff --git a/src/admin/mytag_add.php b/src/admin/mytag_add.php index dc1b5573..cb9fafa4 100644 --- a/src/admin/mytag_add.php +++ b/src/admin/mytag_add.php @@ -14,7 +14,7 @@ if (DEDEBIZ_SAFE_MODE) { } CheckPurview('temp_Other'); require_once(DEDEINC."/typelink/typelink.class.php"); -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; if ($dopost == "save") { CheckCSRF(); $tagname = trim($tagname); diff --git a/src/admin/mytag_tag_guide_ok.php b/src/admin/mytag_tag_guide_ok.php index caca3464..5eb8fe59 100644 --- a/src/admin/mytag_tag_guide_ok.php +++ b/src/admin/mytag_tag_guide_ok.php @@ -14,7 +14,7 @@ if (DEDEBIZ_SAFE_MODE) { } CheckPurview('temp_Other'); //根据生成条件标记 -$attlist = ""; +$attlist = ''; $attlist .= " row='".$row."'"; $attlist .= " titlelen='".$titlelen."'"; if ($orderby != 'senddate') $attlist .= " orderby='".$orderby."'"; diff --git a/src/admin/plus_edit.php b/src/admin/plus_edit.php index 96859298..f22e13f9 100644 --- a/src/admin/plus_edit.php +++ b/src/admin/plus_edit.php @@ -20,14 +20,14 @@ if ($dopost == "show") { ShowMsg("隐藏一个插件", "plus_main.php"); exit(); } else if ($dopost == "delete") { - if (empty($job)) $job = ""; + if (empty($job)) $job = ''; if ($job == "") { //确认 require_once(DEDEINC."/libraries/oxwindow.class.php"); $wintitle = "删除指定插件"; $wecome_info = "插件管理 - 删除插件"; $win = new OxWindow(); - $win->Init("plus_edit.php", "js/blank.js", "POST"); + $win->Init("plus_edit.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("job", "yes"); $win->AddHidden("dopost", $dopost); $win->AddHidden("aid", $aid); diff --git a/src/admin/search_keywords_main.php b/src/admin/search_keywords_main.php index 48466747..7ec7ee12 100644 --- a/src/admin/search_keywords_main.php +++ b/src/admin/search_keywords_main.php @@ -63,18 +63,18 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid') $start = ($pageno - 1) * $pagesize; $printhead = " - +
- + - + - + - - - + + + "; echo $printhead; @@ -92,17 +92,17 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid') "; echo $line; } echo ""; echo "
搜索关键词维护搜索关键词维护
选择idid 关键词 分词结果频率结果搜索时间频率结果搜索时间 操作
{$row['result']} ".MyDate("Y-m-d H:i:s", $row['lasttime'])." - 更新 - 删除 + 更新 + 删除
- 反选 - 取消 - 删除 + 反选 + 取消 + 删除
"; diff --git a/src/admin/soft_add.php b/src/admin/soft_add.php index 7220d82f..9c40f618 100644 --- a/src/admin/soft_add.php +++ b/src/admin/soft_add.php @@ -40,7 +40,7 @@ if ($dopost != 'save') { require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; - if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click); + if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click); if (!isset($typeid2)) $typeid2 = 0; if (!isset($autokey)) $autokey = 0; if (!isset($remote)) $remote = 0; @@ -73,7 +73,7 @@ if ($dopost != 'save') { $sortrank = AddDay($pubdate, $sortup); if ($ishtml == 0) $ismake = -1; else $ismake = 0; - if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click); + if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click); $title = preg_replace('#"#', '"', $title); $title = cn_substrR($title, $cfg_title_maxlen); $shorttitle = cn_substrR($shorttitle, 36); @@ -231,7 +231,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 浏览软件文档发布软件文档修改软件文档管理软件文档 + 浏览文档发布文档修改文档返回文档列表 "; $msg = "{$msg}".GetUpdateTest(); $wintitle = "成功发布软件文档"; diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php index 7f337fa7..1deba287 100644 --- a/src/admin/soft_edit.php +++ b/src/admin/soft_edit.php @@ -47,9 +47,9 @@ if ($dopost != 'save') { foreach ($dtp->CTags as $ctag) { if ($ctag->GetName() == 'link') { $islocal = $ctag->GetAtt('islocal'); - if ($islocal != 1) $needmsg = ""; - else $needmsg = ''; - $nForm .= "
$needmsg
\r\n"; + if ($islocal != 1) $needmsg = ""; + else $needmsg = ''; + $nForm .= "
$needmsg
\r\n"; $newRowStart++; } } @@ -210,7 +210,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 浏览软件文档发布软件文档修改软件文档管理软件文档 + 浏览文档发布文档修改文档返回文档列表 "; $wintitle = "成功修改软件文档"; $wecome_info = "文档管理 - 修改软件文档"; diff --git a/src/admin/spec_add.php b/src/admin/spec_add.php index 90ff54c4..01c2b332 100644 --- a/src/admin/spec_add.php +++ b/src/admin/spec_add.php @@ -28,7 +28,7 @@ if ($dopost != 'save') { require_once(DEDEINC.'/libraries/oxwindow.class.php'); $flag = isset($flags) ? join(',', $flags) : ''; $notpost = isset($notpost) && $notpost == 1 ? 1 : 0; - if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click); + if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click); $channelid = -1; $money = 0; if (!isset($tags)) $tags = ''; @@ -99,7 +99,7 @@ if ($dopost != 'save') { else $rownum = 0; $arcid = preg_replace("#[^0-9,]#", "", $arcid); $ids = explode(",", $arcid); - $okids = ""; + $okids = ''; if (is_array($ids)) { foreach ($ids as $mid) { $mid = trim($mid); @@ -177,7 +177,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 浏览专题发布专题修改专题管理专题 + 浏览专题发布专题修改专题返回专题列表 "; $wintitle = "成功发布专题"; $wecome_info = "专题管理 - 发布专题"; diff --git a/src/admin/spec_edit.php b/src/admin/spec_edit.php index 2c8078de..d01bbbf6 100644 --- a/src/admin/spec_edit.php +++ b/src/admin/spec_edit.php @@ -132,7 +132,7 @@ if ($dopost != 'save') { if (isset(${'keywords'.$i})) { $keywords = str_replace("'", "", trim(${'keywords'.$i})); } else { - $keywords = ""; + $keywords = ''; } if (!empty(${'typeid'.$i})) { $ttypeid = trim(${'typeid'.$i}); @@ -146,7 +146,7 @@ if ($dopost != 'save') { } $arcid = preg_replace("#[^0-9,]#", "", $arcid); $ids = explode(",", $arcid); - $okids = ""; + $okids = ''; if (is_array($ids)) { foreach ($ids as $mid) { $mid = trim($mid); @@ -190,7 +190,7 @@ if ($dopost != 'save') { } //返回成功信息 $msg = " - 浏览专题发布专题修改专题管理专题 + 浏览专题发布专题修改专题返回专题列表 "; $wintitle = "成功修改专题"; $wecome_info = "专题管理 - 修改专题"; diff --git a/src/admin/sys_admin_user_add.php b/src/admin/sys_admin_user_add.php index 2fee740e..a7087181 100644 --- a/src/admin/sys_admin_user_add.php +++ b/src/admin/sys_admin_user_add.php @@ -15,12 +15,12 @@ if (empty($dopost)) $dopost = ''; if ($dopost == 'add') { CheckCSRF(); if (preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd) || preg_match("#[^0-9a-zA-Z_@!\.-]#", $userid)) { - ShowMsg('密码或账号不合法,使用[0-9a-zA-Z_@!.-]范围以内字符', '-1', 0, 3000); + ShowMsg('密码或账号不合法,请使用数字0-9小写a-z大写A-Z符号_@!.-', '-1'); exit(); } $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); if ($safecode != $safecodeok) { - ShowMsg('请填写验证安全码', '-1', 0, 3000); + ShowMsg('请填写验证安全码', '-1'); exit(); } $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__member` WHERE userid LIKE '$userid' "); diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php index 3db3c5bd..d3540cbf 100644 --- a/src/admin/sys_admin_user_edit.php +++ b/src/admin/sys_admin_user_edit.php @@ -17,11 +17,11 @@ if ($dopost == 'saveedit') { CheckCSRF(); $pwd = trim($pwd); if ($pwd != '' && preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd)) { - ShowMsg('密码不合法,使用[0-9a-zA-Z_@!.-]范围以内字符', '-1', 0, 3000); + ShowMsg('密码不合法,请使用数字0-9小写a-z大写A-Z符号_@!.-', '-1'); exit(); } if (preg_match("#[^0-9a-zA-Z_@!\.-]#", $userid)) { - ShowMsg('账号不合法,使用[0-9a-zA-Z_@!.-]范围以内字符', '-1', 0, 3000); + ShowMsg('账号不合法,请使用数字0-9小写a-z大写A-Z符号_@!.-', '-1'); exit(); } $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); @@ -47,7 +47,7 @@ if ($dopost == 'saveedit') { } $olduserid = preg_replace("/[^0-9a-zA-Z_@!\.-]/", '', $olduserid); $userid = preg_replace("/[^0-9a-zA-Z_@!\.-]/", '', $userid); - $usql = ""; + $usql = ''; if ($olduserid !== $userid) { $row = $dsql->GetOne("SELECT mid FROM `#@__member` WHERE userid LIKE '$userid' "); if (is_array($row)) { @@ -72,7 +72,7 @@ if ($dopost == 'saveedit') { ShowMsg("成功修改一个账户", "sys_admin_user.php"); exit(); } else if ($dopost == 'delete') { - if (empty($userok)) $userok = ""; + if (empty($userok)) $userok = ''; if ($userok != "yes") { $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); @@ -80,7 +80,7 @@ if ($dopost == 'saveedit') { $wintitle = "删除指定管理员"; $wecome_info = "系统帐号管理 - 删除管理员"; $win = new OxWindow(); - $win->Init("sys_admin_user_edit.php", "js/blank.js", "POST"); + $win->Init("sys_admin_user_edit.php", "/static/web/js/admin.blank.js", "POST"); $win->AddHidden("dopost", $dopost); $win->AddHidden("userok", "yes"); $win->AddHidden("randcode", $randcode); @@ -104,7 +104,7 @@ if ($dopost == 'saveedit') { $dsql->ExecuteNoneQuery("UPDATE `#@__member` SET matt='0' WHERE mid='$id' LIMIT 1"); ShowMsg("成功删除一个帐户", "sys_admin_user.php"); } else { - ShowMsg("不能删除id为1的创建人帐号,不能删除自己", "sys_admin_user.php", 0, 3000); + ShowMsg("不能删除id为1的创建人帐号,不能删除自己", "sys_admin_user.php"); } exit(); } diff --git a/src/admin/sys_cache_up.php b/src/admin/sys_cache_up.php index b3c8c39c..3ad2b9ba 100644 --- a/src/admin/sys_cache_up.php +++ b/src/admin/sys_cache_up.php @@ -10,6 +10,20 @@ */ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_ArcBatch'); +function clean_cachefiles($path) { + $list = array(); + foreach (glob($path.'/*') as $item) { + if(is_dir($item)) { + $list = array_merge($list, clean_cachefiles($item)); + } else { + $list[] = $item; + } + } + foreach ($list as $tmpfile) { + @unlink($tmpfile); + } + return true; +} if (empty($dopost)) $dopost = ''; if (empty($step)) $step = 1; if ($dopost == "ok") { @@ -23,39 +37,42 @@ if ($dopost == "ok") { else if ($step == 1) { UpDateCatCache(); ClearOptCache(); - ShowMsg("正在清理栏目缓存,继续清理枚举缓存", "sys_cache_up.php?dopost=ok&step=2&uparc=$uparc"); + ShowMsg("开始清理栏目缓存,继续清理枚举缓存", "sys_cache_up.php?dopost=ok&step=2&uparc=$uparc"); exit(); } //更新枚举缓存 else if ($step == 2) { include_once(DEDEINC."/enums.func.php"); WriteEnumsCache(); - //WriteAreaCache(); 已过期 ShowMsg("正在清理枚举缓存,继续清理调用缓存", "sys_cache_up.php?dopost=ok&step=3&uparc=$uparc"); exit(); } - //清理arclist调用缓存、过期会员浏览历史、过期短信、陈旧的流量统计数据 + //清理arclist调用缓存、过期会员浏览历史、过期短信、之前15天流量统计 else if ($step == 3) { echo ""; $dsql->ExecuteNoneQuery("DELETE FROM `#@__arccache`"); $msg = array(); - $msg[] = "正在清理arclist调用缓存,继续清理过期会员浏览历史"; + $msg[] = "继续清理arclist调用缓存,过期会员浏览历史"; $oldtime = time() - (90 * 24 * 3600); $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_pms` WHERE sendtime<'$oldtime' "); - $msg[] = "正在清理过期短信,继续修正错误文档,要占较长时间"; + $msg[] = "过期短信,错误文档"; $limit = date('Ymd', strtotime('-15 days')); $dsql->ExecuteNoneQuery("DELETE FROM `#@__statistics_detail` WHERE created_date < '$limit'"); - $msg[] = "正在清理15天之前流量统计"; + $msg[] = "之前15天流量统计"; $url = "sys_cache_up.php?dopost=ok&step=-1&uparc=$uparc"; + clean_cachefiles("../data/cache"); + clean_cachefiles("../data/tplcache"); + clean_cachefiles("../data/sessions"); + clean_cachefiles("../static/enums"); if ($uparc == 1) { $url = "sys_cache_up.php?dopost=ok&step=9"; } - ShowMsg(implode("
",$msg),$url); + ShowMsg(implode(",", $msg), $url); exit(); } //修正错误文档 else if ($step == 9) { - ShowMsg('清理错误文档已取消,到系统修复工具进行操作', 'sys_cache_up.php?dopost=ok&step=-1&uparc=1', 0, 5000); + ShowMsg('清理错误文档已取消,建议用系统修复工具清理', 'sys_cache_up.php?dopost=ok&step=-1&uparc=1'); exit(); } } diff --git a/src/admin/sys_data_done.php b/src/admin/sys_data_done.php index 84b2ad86..4fae4732 100644 --- a/src/admin/sys_data_done.php +++ b/src/admin/sys_data_done.php @@ -64,7 +64,7 @@ if ($dopost == 'bak') { $dh->close(); $tmsg .= "完成备份目录旧数据清理"; if ($isstruct == 1) { - $bkfile = $bkdir."/tables_struct_".substr(md5(time().mt_rand(1000, 5000).$cfg_cookie_encode), 0, 16).".txt"; + $bkfile = $bkdir."/tables_struct_".substr(md5(time().mt_rand(1000, 6000).$cfg_cookie_encode), 0, 16).".txt"; $mysql_version = $dsql->GetVersion(); $fp = fopen($bkfile, "w"); foreach ($tables as $t) { @@ -115,7 +115,7 @@ if ($dopost == 'bak') { $dsql->SetQuery("SELECT * FROM `$nowtable`"); $dsql->Execute(); $m = 0; - $bakfilename = "$bkdir/{$nowtable}_{$startpos}_".substr(md5(time().mt_rand(1000, 5000).$cfg_cookie_encode), 0, 16).".txt"; + $bakfilename = "$bkdir/{$nowtable}_{$startpos}_".substr(md5(time().mt_rand(1000, 6000).$cfg_cookie_encode), 0, 16).".txt"; while ($row2 = $dsql->GetArray()) { if ($m < $startpos) { $m++; @@ -189,7 +189,7 @@ else if ($dopost == 'redat') { $bakfilesTmp = $bakfiles; $bakfiles = explode(',', $bakfiles); if (empty($structfile)) { - $structfile = ""; + $structfile = ''; } if (empty($delfile)) { $delfile = 0; @@ -254,7 +254,7 @@ else if ($dopost == 'redat') { function PutInfo($msg1, $msg2) { global $cfg_soft_lang; - $msginfo = "系统提示

系统提示

{$msg1}{$msg2}
"; + $msginfo = "系统提示

系统提示

{$msg1}{$msg2}
"; echo $msginfo.""; } function RpLine($str) diff --git a/src/admin/sys_data_replace.php b/src/admin/sys_data_replace.php index 929bd925..27ddbddc 100644 --- a/src/admin/sys_data_replace.php +++ b/src/admin/sys_data_replace.php @@ -22,10 +22,10 @@ if (empty($action)) { else if ($action == 'getfields') { AjaxHead(); $dsql->GetTableFields($exptable); - echo "
"; - echo "

表".$exptable."含有的字段:

"; + echo "
"; + echo "

请选择".$exptable."表下面字段

"; while ($row = $dsql->GetFieldObject()) { - echo "name}')\">".$row->name."\r\n"; + echo "name}')\">".$row->name." "; } echo "
"; exit(); diff --git a/src/admin/sys_group.php b/src/admin/sys_group.php index 46da26da..0f1d5507 100644 --- a/src/admin/sys_group.php +++ b/src/admin/sys_group.php @@ -10,6 +10,6 @@ */ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_Group'); -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; include DedeInclude('templets/sys_group.htm'); ?> \ No newline at end of file diff --git a/src/admin/sys_group_edit.php b/src/admin/sys_group_edit.php index 10101e45..274740ee 100644 --- a/src/admin/sys_group_edit.php +++ b/src/admin/sys_group_edit.php @@ -10,13 +10,13 @@ */ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_Group'); -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; if ($dopost == 'save') { if ($rank == 10) { ShowMsg('超级管理员的权限不允许修改!', 'sys_group.php'); exit(); } - $purview = ""; + $purview = ''; if (is_array($purviews)) { foreach ($purviews as $p) { $purview .= "$p "; diff --git a/src/admin/sys_info.php b/src/admin/sys_info.php index 98d7aa3c..e88d3636 100644 --- a/src/admin/sys_info.php +++ b/src/admin/sys_info.php @@ -10,7 +10,7 @@ */ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_Edit'); -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; $configfile = DEDEDATA.'/config.cache.inc.php'; //更新配置函数 function ReWriteConfig() @@ -99,11 +99,11 @@ else if ($dopost == 'search') { $keywords = isset($keywords) ? strip_tags($keywords) : ''; $i = 1; $configstr = << + - + - + @@ -124,9 +124,9 @@ EOT; if ($row['type'] == 'bool') { $c1 = ''; $c2 = ''; - $row['value'] == 'Y' ? $c1 = " checked" : $c2 = " checked"; - echo " "; - echo " "; + $row['value'] == 'Y' ? $c1 = "checked" : $c2 = "checked"; + echo " "; + echo " "; } else if ($row['type'] == 'bstring') { echo ""; } else if ($row['type'] == 'number') { @@ -146,7 +146,7 @@ EOT; exit; } if ($i == 1) { - echo '
系统设置搜索系统设置搜索
参数说明 参数值 变量名
搜索不到参数
'; + echo '搜索不到参数'; } exit; } else if ($dopost == 'make_encode') { diff --git a/src/admin/sys_info_mark.php b/src/admin/sys_info_mark.php index cd0caae3..c006cfcb 100644 --- a/src/admin/sys_info_mark.php +++ b/src/admin/sys_info_mark.php @@ -12,11 +12,11 @@ require_once(dirname(__FILE__)."/config.php"); CheckPurview('sys_Edit'); require_once(DEDEINC."/image.func.php"); if ($cfg_photo_support == '') { - echo "您的系统没安装GD库,不允许使用本功能"; + echo "未安装GD库,不允许使用该功能"; exit(); } $ImageWaterConfigFile = DEDEDATA."/mark/inc_photowatermark_config.php"; -if (empty($action)) $action = ""; +if (empty($action)) $action = ''; $allow_mark_types = array( 'image/gif', 'image/xpng', @@ -24,7 +24,7 @@ $allow_mark_types = array( ); if ($action == "save") { $vars = array('photo_markup', 'photo_markdown', 'photo_marktype', 'photo_wwidth', 'photo_wheight', 'photo_waterpos', 'photo_watertext', 'photo_fontsize', 'photo_fontcolor', 'photo_marktrans', 'photo_diaphaneity'); - $configstr = $shortname = ""; + $configstr = $shortname = ''; foreach ($vars as $v) { $tmp = stripslashes(${'get_'.$v}); ${$v} = addslashes(str_replace("'", "", $tmp)); diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php index 61d89ed2..b104f69d 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -13,7 +13,7 @@ CheckPurview('sys_ArcBatch'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); if (empty($dopost)) { $win = new OxWindow(); - $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data'"); + $win->Init("sys_repair.php", "/static/web/js/admin.blank.js", "POST' enctype='multipart/form-data'"); $wecome_info = "系统修复工具"; $win->AddTitle('系统修复工具用于检测和修复系统数据错误'); $msg = " @@ -26,7 +26,7 @@ if (empty($dopost)) { - 开始检测 + 开始检测 "; $win->AddMsgItem($msg); $winform = $win->GetWindow("hand", false); @@ -36,7 +36,7 @@ if (empty($dopost)) { //数据结构常规检测 else if ($dopost == 1) { $win = new OxWindow(); - $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data'"); + $win->Init("sys_repair.php", "/static/web/js/admin.blank.js", "POST' enctype='multipart/form-data'"); $wecome_info = "系统修复工具 - 检测数据结构"; $win->AddTitle('系统修复工具用于检测和修复系统数据错误'); $msg = " @@ -47,7 +47,7 @@ else if ($dopost == 1) { 3、列表显示数据目与实际文档数不一致 - 下一步 + 下一步 "; $win->AddMsgItem($msg); $winform = $win->GetWindow("hand", false); @@ -105,14 +105,14 @@ else if ($dopost == 2) { } UpDateCatCache(); $win = new OxWindow(); - $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data'"); + $win->Init("sys_repair.php", "/static/web/js/admin.blank.js", "POST' enctype='multipart/form-data'"); $wecome_info = "系统修复工具 - 检测微表数据"; $win->AddTitle('系统修复工具用于检测和修复系统数据错误'); $msg = " {$msg} - {$errall} + {$errall} "; $win->AddMsgItem($msg); $winform = $win->GetWindow("hand", false); @@ -151,14 +151,14 @@ else if ($dopost == 3) { } } $win = new OxWindow(); - $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data'"); + $win->Init("sys_repair.php", "/static/web/js/admin.blank.js", "POST' enctype='multipart/form-data'"); $wecome_info = "系统修复工具 - 高级检测"; $win->AddTitle('系统修复工具用于检测和修复系统数据错误'); $msg = " 完成所有修复操作,移除错误记录{$errnum}条 - 完成修复 + 完成修复 "; $win->AddMsgItem($msg); $winform = $win->GetWindow("hand", false); diff --git a/src/admin/sys_safetest.php b/src/admin/sys_safetest.php index 14e3fd1c..4930001e 100644 --- a/src/admin/sys_safetest.php +++ b/src/admin/sys_safetest.php @@ -22,7 +22,7 @@ $offFiles = array(); foreach ($filelist as $key => $ff) { $offFiles[$ff->filename] = $ff->hash; } -$alter = ""; +$alter = ''; if (count($offFiles) == 0) { $alter = DedeAlert('官方文件服务器通信失败,无法保证本地文件和同官方文件服务器是否一致', ALERT_DANGER); } @@ -83,7 +83,7 @@ if ($action == 'test') { $del->OpenUrl($baseFile); $base = $del->GetHTML(); $file = "$cfg_basedir/$filename"; - $new = ""; + $new = ''; if (is_file($file)) { $fp = fopen($file, "r"); $new = fread($fp, filesize($file)); diff --git a/src/admin/sys_sql_query.php b/src/admin/sys_sql_query.php index e299f0d6..cbb00b18 100644 --- a/src/admin/sys_sql_query.php +++ b/src/admin/sys_sql_query.php @@ -13,7 +13,7 @@ if (DEDEBIZ_SAFE_MODE) { die(DedeAlert("系统已启用安全模式,无法使用当前功能",ALERT_DANGER)); } CheckPurview('sys_Data'); -if (empty($dopost)) $dopost = ""; +if (empty($dopost)) $dopost = ''; //查看表结构 if ($dopost == "viewinfo") { CheckCSRF(); @@ -90,7 +90,7 @@ else if ($dopost == "query") { echo "删除数据表或数据库的语句不允许在这里执行"; exit(); } - echo ''; + echo ''; //运行查询语句 if (preg_match("#^select #i", $sqlquery)) { $dsql->SetQuery($sqlquery); @@ -119,7 +119,7 @@ else if ($dopost == "query") { //普通的SQL语句 $sqlquery = str_replace("\r", "", $sqlquery); $sqls = preg_split("#;[ \t]{0,}\n#", $sqlquery); - $nerrCode = ""; + $nerrCode = ''; $i = 0; foreach ($sqls as $q) { $q = trim($q); diff --git a/src/admin/tag_test_action.php b/src/admin/tag_test_action.php index 5ac3e88d..618ee285 100644 --- a/src/admin/tag_test_action.php +++ b/src/admin/tag_test_action.php @@ -21,7 +21,7 @@ if (empty($partcode)) { } $partcode = stripslashes($partcode); if (empty($typeid)) $typeid = 0; -if (empty($showsource)) $showsource = ""; +if (empty($showsource)) $showsource = ''; if ($typeid > 0) $pv = new PartView($typeid); else $pv = new PartView(); $pv->SetTemplet($partcode, "string"); diff --git a/src/admin/tags_main.php b/src/admin/tags_main.php index 65715a63..924e29fa 100644 --- a/src/admin/tags_main.php +++ b/src/admin/tags_main.php @@ -31,40 +31,36 @@ if (empty($action)) { $dlist->Display(); exit(); } -/* -function update() -*/ +//function update() else if ($action == 'update') { $tid = (empty($tid) ? 0 : intval($tid)); $count = (empty($count) ? 0 : intval($count)); if (empty($tid)) { - ShowMsg('没有选择要删除的标签', '-1'); + ShowMsg('请选择需要删除的标签', '-1'); exit(); } $query = "UPDATE `#@__tagindex` SET `count`='$count' WHERE id='$tid' "; $dsql->ExecuteNoneQuery($query); - ShowMsg("成功保存标签的点击信息", 'tags_main.php'); + ShowMsg("成功保存标签点击信息", 'tags_main.php'); exit(); } -/* -function delete() -*/ +//function delete() else if ($action == 'delete') { if (@is_array($ids)) { $stringids = implode(',', $ids); } else if (!empty($ids)) { $stringids = $ids; } else { - ShowMsg('没有选择要删除的标签', '-1'); + ShowMsg('请选择需要删除的标签', '-1'); exit(); } $query = "DELETE FROM `#@__tagindex` WHERE id IN ($stringids)"; if ($dsql->ExecuteNoneQuery($query)) { $query = "DELETE FROM `#@__taglist` WHERE tid IN ($stringids)"; $dsql->ExecuteNoneQuery($query); - ShowMsg("删除tags [$stringids] 成功", 'tags_main.php'); + ShowMsg("删除[$stringids]标签成功", 'tags_main.php'); } else { - ShowMsg("删除tags [$stringids] 失败", 'tags_main.php'); + ShowMsg("删除[$stringids]标签失败", 'tags_main.php'); } exit(); } else if ($action == 'get_one') { @@ -81,9 +77,7 @@ else if ($action == 'delete') { $dsql->ExecuteNoneQuery("UPDATE `#@__tagindex` SET title='{$title}',keywords='{$kw}',`description`='{$des}',`uptime`='{$now}' WHERE id = {$tid}"); echo json_encode(array('code' => 200, 'result' => true)); } -/* -function fetch() -*/ +//function fetch() else if ($action == 'fetch') { $wheresql = ''; $start = isset($start) && is_numeric($start) ? $start : 0; @@ -118,14 +112,13 @@ else if ($action == 'fetch') { } foreach ($keyarr as $keyword) { $keyword = trim($keyword); - if ($keyword != '' && strlen($keyword) < 13) { + if ($keyword != '' && strlen($keyword) < 24) { $keyword = addslashes($keyword); $row = $dsql->GetOne("SELECT id,total FROM `#@__tagindex` WHERE tag LIKE '$keyword'"); if (is_array($row)) { $tid = $row['id']; $trow = $dsql->GetOne("SELECT COUNT(*) as dd FROM `#@__taglist` WHERE tag LIKE '$keyword'"); if (intval($trow['dd']) != $row['total']) { - $query = "UPDATE `#@__tagindex` SET `total`=".$trow['dd'].",uptime=$now WHERE id='$tid' "; $dsql->ExecuteNoneQuery($query); } @@ -141,12 +134,12 @@ else if ($action == 'fetch') { $complete = FALSE; } if ($complete) { - ShowMsg("tags获取完成", 'tags_main.php'); + ShowMsg('完成标签获取', 'tags_main.php'); exit(); } $start = $start + 100; $goto = "tags_main.php?action=fetch&startaid=$startaid&endaid=$endaid&start=$start"; - ShowMsg('继续获取tags ', $goto, 0, 500); + ShowMsg('正在获取标签', $goto); exit(); } ?> \ No newline at end of file diff --git a/src/admin/task_do.php b/src/admin/task_do.php index 43ceb598..942e2c84 100644 --- a/src/admin/task_do.php +++ b/src/admin/task_do.php @@ -10,7 +10,7 @@ */ require(dirname(__FILE__).'/config.php'); $dopost = (!isset($dopost) ? '' : $dopost); -//返回到下一任务链接,特殊变量,除非知道作用,否则不能在任务传递中占用:f临时,仅为了方便网址结构,dopost当前任务指向下一个任务,由会员自行处理或在nextdo中自动获得,del上一次任务删除的变量,morejob设定后,表示当前任务需请求多次,会把 dopost和nextdo处理后转为doposttmp和nextdotmp然后由会员自行处理 +//返回到下一任务链接,特殊变量,除非知道作用,否则不能在任务传递中占用:f临时,仅为了方便网址结构,dopost当前任务指向下一个任务,由会员自行处理或在nextdo中自动获得,del上一次任务删除的变量,morejob设定后,表示当前任务需请求多次,会把dopost和nextdo处理后转为doposttmp和nextdotmp然后由会员自行处理 function GetNextUrl($notallowArr = array('dopost', 'f', 'del')) { $reurl = "task_do.php?f=0"; @@ -40,7 +40,7 @@ function GetNextUrl($notallowArr = array('dopost', 'f', 'del')) } return $reurl; } -//更新上一篇和下一篇 +//更新上篇和下篇 if ($dopost == 'makeprenext') { require_once(DEDEINC.'/archive/archives.class.php'); $aid = intval($aid); @@ -61,7 +61,7 @@ if ($dopost == 'makeprenext') { exit(); } else { $jumpurl = GetNextUrl(); - ShowMsg("完成下篇文档更新任务,继续更新其它任务", $jumpurl, 0, 500); + ShowMsg("完成下篇文档更新任务,继续更新其它任务", $jumpurl); exit(); } } @@ -75,12 +75,12 @@ if ($dopost == 'makeindex') { $templet = str_replace("{style}", $cfg_df_style, $row['templet']); $homeFile = dirname(__FILE__).'/'.$row['position']; $homeFile = str_replace("//", "/", str_replace("\\", "/", $homeFile)); - $fp = fopen($homeFile, 'w') or die("无法更新网站首页到:$homeFile 位置"); + $fp = fopen($homeFile, 'w') or die("无法更新网站首页到:".$homeFile."位置"); fclose($fp); $tpl = $cfg_basedir.$cfg_templets_dir.'/'.$templet; if (!file_exists($tpl)) { $tpl = $cfg_basedir.$cfg_templets_dir.'/dedebiz/index.htm'; - if (!file_exists($tpl)) exit("无法找到首页模板:$tpl "); + if (!file_exists($tpl)) exit("无法找到首页模板:$tpl"); } $GLOBALS['_arclistEnv'] = 'index'; $pv->SetTemplet($tpl); @@ -91,7 +91,7 @@ if ($dopost == 'makeindex') { exit(); } else { $jumpurl = GetNextUrl(); - ShowMsg("完成首页更新,正在前往其它更新任务", $jumpurl, 0, 500); + ShowMsg("完成首页更新,正在前往其它更新任务", $jumpurl); exit(); } } @@ -125,7 +125,7 @@ else if ($dopost == 'makeparenttype') { if (!empty($doposttmp)) { $jumpurl = preg_replace("#doposttmp|nextdotmp#", 'del', $jumpurl); $jumpurl .= "&dopost={$doposttmp}&nextdo={$nextdotmp}"; - ShowMsg("完成栏目:{$tid}更新,继续更新后续任务", $jumpurl, 0, 500); + ShowMsg("完成栏目:{$tid}更新,继续更新后续任务", $jumpurl); exit(); } else { ShowMsg("完成栏目:{$tid}更新,完成所有更新任务", "close::tgtable"); @@ -134,7 +134,7 @@ else if ($dopost == 'makeparenttype') { } else { $curpage++; $jumpurl .= "&curpage={$curpage}&dopost=makeparenttype"; - ShowMsg("完成栏目:{$tid}更新,继续更新其它栏目", $jumpurl, 0, 500); + ShowMsg("完成栏目:{$tid}更新,继续更新其它栏目", $jumpurl); exit(); } } diff --git a/src/admin/templets/action_search.htm b/src/admin/templets/action_search.htm index dc562384..30c26fa6 100644 --- a/src/admin/templets/action_search.htm +++ b/src/admin/templets/action_search.htm @@ -2,20 +2,20 @@ - + 搜索结果 - - - + + + - +
- + - + diff --git a/src/admin/templets/ad_add.htm b/src/admin/templets/ad_add.htm index 2c9dfb8d..38cc6731 100644 --- a/src/admin/templets/ad_add.htm +++ b/src/admin/templets/ad_add.htm @@ -2,25 +2,24 @@ - + 添加广告 - - - - - - - - + + + + + + + - + -
当前位置 - 搜索结果当前位置 - 搜索结果
+
- + @@ -78,14 +77,13 @@ @@ -95,13 +93,13 @@ - +
广告管理 - 添加广告广告管理 - 添加广告
@@ -64,7 +63,7 @@
时间限制: - +
广告文档: -
+
    -
  • 代码
  • +
  • 代码
  • 文字
  • 图片
  • Flash
-