From c3ed4f757c4a4803f4fc86d0c9c46fc049e70620 Mon Sep 17 00:00:00 2001 From: llgoer Date: Mon, 4 Jan 2021 12:36:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=AF=B9FTP=E7=9A=84?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dede/album_add.php | 17 +- src/dede/album_edit.php | 17 +- src/dede/archives_add.php | 20 +- src/dede/archives_do.php | 4 +- src/dede/archives_edit.php | 17 +- src/dede/archives_sg_add.php | 19 +- src/dede/archives_sg_edit.php | 23 +- src/dede/article_add.php | 17 +- src/dede/article_coonepage_rule.php | 4 +- src/dede/article_edit.php | 20 +- src/dede/article_template_rand.php | 4 +- src/dede/config.php | 1 - src/dede/content_list.php | 4 +- src/dede/content_sg_list.php | 4 +- src/dede/css/base.css | 691 +++++++++--------- src/dede/dialog/config.php | 20 - src/dede/dialog/select_images.php | 14 +- src/dede/dialog/select_images_post.php | 10 +- src/dede/dialog/select_media.php | 26 +- src/dede/dialog/select_soft.php | 14 +- src/dede/dialog/select_soft_post.php | 9 - src/dede/dialog/select_templets.php | 2 +- src/dede/freelist_main.php | 6 +- src/dede/inc/grouplist.txt | 1 - src/dede/inc/inc_action_info.php | 6 - src/dede/inc/inc_archives_functions.php | 2 +- src/dede/inc/inc_menu.php | 3 - src/dede/inc/inc_menu_map.php | 1 - src/dede/index_testenv.php | 2 +- src/dede/js/contextmenu.css | 136 ++-- src/dede/js/main.js | 2 +- src/dede/makehtml_homepage.php | 4 +- src/dede/makehtml_map.php | 2 +- src/dede/makehtml_spec.php | 2 +- src/dede/makeremote_all.php | 300 -------- src/dede/media_edit.php | 25 +- src/dede/module_main.php | 10 +- src/dede/search_keywords_main.php | 10 +- src/dede/soft_add.php | 10 +- src/dede/soft_edit.php | 12 +- src/dede/spec_add.php | 6 +- src/dede/spec_edit.php | 8 +- src/dede/sys_safetest.php | 6 +- src/dede/sys_task.php | 22 - src/dede/sys_task_add.php | 31 - src/dede/sys_task_edit.php | 42 -- src/dede/templets/ad_add.htm | 2 +- src/dede/templets/ad_edit.htm | 2 +- src/dede/templets/ad_main.htm | 12 +- src/dede/templets/album_add.htm | 26 +- src/dede/templets/album_edit.htm | 18 +- src/dede/templets/archives_add.htm | 22 +- src/dede/templets/archives_edit.htm | 18 +- src/dede/templets/archives_sg_add.htm | 16 +- src/dede/templets/archives_sg_edit.htm | 12 +- src/dede/templets/article_add.htm | 32 +- src/dede/templets/article_coonepage_rule.htm | 16 +- .../templets/article_description_main.htm | 4 +- src/dede/templets/article_edit.htm | 16 +- src/dede/templets/article_keywords_main.htm | 12 +- src/dede/templets/article_keywords_make.htm | 6 +- src/dede/templets/article_keywords_select.htm | 6 +- src/dede/templets/article_test_same.htm | 2 +- src/dede/templets/baidunews.htm | 2 +- src/dede/templets/cards_make.htm | 6 +- src/dede/templets/cards_manmage.htm | 16 +- src/dede/templets/cards_type.htm | 2 +- src/dede/templets/catalog_add.htm | 10 +- src/dede/templets/catalog_add_quick.htm | 16 +- src/dede/templets/catalog_edit.htm | 10 +- src/dede/templets/catalog_main.htm | 16 +- src/dede/templets/catalog_menu2.htm | 10 +- src/dede/templets/content_att.htm | 2 +- src/dede/templets/content_batch_up.htm | 4 +- src/dede/templets/content_i_list.htm | 38 +- src/dede/templets/content_list.htm | 42 +- src/dede/templets/content_s_list.htm | 24 +- src/dede/templets/content_select_list.htm | 8 +- src/dede/templets/content_sg_list.htm | 34 +- src/dede/templets/diy_add.htm | 4 +- src/dede/templets/diy_edit.htm | 10 +- src/dede/templets/diy_edit_content.htm | 4 +- src/dede/templets/diy_field_add.htm | 6 +- src/dede/templets/diy_field_edit.htm | 6 +- src/dede/templets/diy_list.htm | 2 +- src/dede/templets/diy_main.htm | 8 +- src/dede/templets/erradd.htm | 6 +- src/dede/templets/feedback_edit.htm | 4 +- src/dede/templets/feedback_main.htm | 18 +- src/dede/templets/file_edit.htm | 6 +- src/dede/templets/file_manage_main.htm | 108 +-- src/dede/templets/freelist_add.htm | 4 +- src/dede/templets/freelist_edit.htm | 4 +- src/dede/templets/freelist_main.htm | 8 +- src/dede/templets/friendlink_add.htm | 4 +- src/dede/templets/friendlink_edit.htm | 4 +- src/dede/templets/friendlink_main.htm | 18 +- src/dede/templets/friendlink_type.htm | 6 +- src/dede/templets/index2.htm | 19 +- src/dede/templets/index_body.htm | 4 +- src/dede/templets/log_list.htm | 8 +- src/dede/templets/makehtml_all.htm | 8 +- src/dede/templets/makehtml_archives.htm | 6 +- src/dede/templets/makehtml_freelist.htm | 4 +- src/dede/templets/makehtml_homepage.htm | 6 +- src/dede/templets/makehtml_js.htm | 6 +- src/dede/templets/makehtml_list.htm | 6 +- src/dede/templets/makehtml_map_guide.htm | 2 +- src/dede/templets/makehtml_rss.htm | 2 +- src/dede/templets/makehtml_spec.htm | 2 +- src/dede/templets/makehtml_taglist.htm | 4 +- src/dede/templets/media_add.htm | 8 +- src/dede/templets/media_edit.htm | 4 +- src/dede/templets/media_main.htm | 14 +- src/dede/templets/member_main.htm | 16 +- src/dede/templets/member_operations.htm | 20 +- src/dede/templets/member_pm.htm | 2 +- src/dede/templets/member_rank.htm | 2 +- src/dede/templets/member_scores.htm | 2 +- src/dede/templets/member_toadmin.htm | 4 +- src/dede/templets/member_type.htm | 6 +- src/dede/templets/member_view.htm | 4 +- src/dede/templets/module_edit.htm | 4 +- src/dede/templets/module_main.htm | 6 +- src/dede/templets/module_make.htm | 4 +- src/dede/templets/mychannel_add.htm | 4 +- src/dede/templets/mychannel_edit.htm | 6 +- src/dede/templets/mychannel_field_add.htm | 8 +- src/dede/templets/mychannel_field_edit.htm | 8 +- src/dede/templets/mychannel_main.htm | 6 +- src/dede/templets/mychannel_modifysearch.htm | 4 +- src/dede/templets/mytag_add.htm | 2 +- src/dede/templets/mytag_main.htm | 4 +- src/dede/templets/mytag_tag_guide.htm | 6 +- src/dede/templets/public_guide.htm | 10 +- src/dede/templets/recycling.htm | 8 +- src/dede/templets/search_keywords_main.htm | 2 +- src/dede/templets/shops_delivery.htm | 8 +- src/dede/templets/shops_operations.htm | 26 +- src/dede/templets/shops_operations_cart.htm | 2 +- src/dede/templets/soft_add.htm | 30 +- src/dede/templets/soft_config.htm | 6 +- src/dede/templets/soft_edit.htm | 18 +- src/dede/templets/spec_add.htm | 22 +- src/dede/templets/spec_edit.htm | 20 +- src/dede/templets/stepselect_main.htm | 24 +- src/dede/templets/stepselect_showajax.htm | 4 +- src/dede/templets/sys_admin_user.htm | 12 +- src/dede/templets/sys_admin_user_add.htm | 6 +- src/dede/templets/sys_admin_user_edit.htm | 4 +- src/dede/templets/sys_cache_up.htm | 2 +- src/dede/templets/sys_data.htm | 36 +- src/dede/templets/sys_data_replace.htm | 2 +- src/dede/templets/sys_data_revert.htm | 12 +- src/dede/templets/sys_group.htm | 8 +- src/dede/templets/sys_group_add.htm | 2 +- src/dede/templets/sys_group_edit.htm | 2 +- src/dede/templets/sys_info.htm | 12 +- src/dede/templets/sys_info_mark.htm | 4 +- src/dede/templets/sys_payment_install.htm | 2 +- src/dede/templets/sys_safetest.htm | 4 +- src/dede/templets/sys_sql_query.htm | 16 +- src/dede/templets/sys_task.htm | 87 --- src/dede/templets/sys_task_add.htm | 117 --- src/dede/templets/sys_task_edit.htm | 138 ---- src/dede/templets/tag_test.htm | 2 +- src/dede/templets/tags_main.htm | 16 +- src/dede/templets/templets_default.htm | 12 +- src/dede/templets/templets_one.htm | 14 +- src/dede/templets/templets_one_add.htm | 4 +- src/dede/templets/templets_one_edit.htm | 4 +- src/dede/templets/templets_tagsource.htm | 4 +- src/dede/templets/tpl_edit.htm | 6 +- src/dede/templets/tpl_edit_tag.htm | 6 +- src/dede/templets/vote_add.htm | 8 +- src/dede/templets/vote_edit.htm | 4 +- src/dede/templets/vote_getcode.htm | 2 +- src/dede/templets/vote_main.htm | 8 +- src/include/arc.archives.class.php | 5 +- src/include/arc.listview.class.php | 5 +- src/include/arc.partview.class.php | 5 +- src/include/arc.rssview.class.php | 4 - src/include/arc.specview.class.php | 4 - src/include/customfields.func.php | 4 +- src/include/ftp.class.php | 617 ---------------- src/include/oxwindow.class.php | 6 +- src/include/typeunit.class.admin.php | 64 +- src/install/config.cache.inc.php | 1 - src/install/sql-dfdata.txt | 1 - src/plus/task.php | 100 --- src/plus/task/dede-maketimehtml.php | 6 - src/plus/task/dede-optimize-table.php | 6 - src/plus/task/dede-upcache.php | 6 - .../ckeditor/plugins/ddfilebrowser/plugin.js | 32 +- 194 files changed, 1225 insertions(+), 2896 deletions(-) delete mode 100755 src/dede/makeremote_all.php delete mode 100755 src/dede/sys_task.php delete mode 100755 src/dede/sys_task_add.php delete mode 100755 src/dede/sys_task_edit.php delete mode 100755 src/dede/templets/sys_task.htm delete mode 100755 src/dede/templets/sys_task_add.htm delete mode 100755 src/dede/templets/sys_task_edit.htm delete mode 100755 src/include/ftp.class.php delete mode 100755 src/plus/task.php delete mode 100755 src/plus/task/dede-maketimehtml.php delete mode 100755 src/plus/task/dede-optimize-table.php delete mode 100755 src/plus/task/dede-upcache.php diff --git a/src/dede/album_add.php b/src/dede/album_add.php index 10bcdcb1..0b82ab1c 100755 --- a/src/dede/album_add.php +++ b/src/dede/album_add.php @@ -314,15 +314,6 @@ function __save(){ } //生成HTML InsertTags($tags, $arcID); - if ($cfg_remote_site == 'Y' && $isremote == "1") { - if ($serviterm != "") { - list($servurl, $servuser, $servpwd) = explode(',', $serviterm); - $config = array('hostname' => $servurl, 'username' => $servuser, 'password' => $servpwd, 'debug' => 'TRUE'); - } else { - $config = array(); - } - if (!$ftp->connect($config)) exit('Error:None FTP Connection!'); - } $artUrl = MakeArt($arcID, TRUE, TRUE, $isremote); if ($artUrl == '') { $artUrl = $cfg_phpurl . "/view.php?aid=$arcID"; @@ -344,13 +335,13 @@ function __save(){ } //返回成功信息 $msg = " 　　请选择你的后续操作： - 继续发布图片 + 继续发布图片    - 更改图集 + 更改图集    - 预览文档 + 预览文档    - 已发布图片管理 + 已发布图片管理    $backurl "; diff --git a/src/dede/album_edit.php b/src/dede/album_edit.php index 668c5c2b..9950b51e 100755 --- a/src/dede/album_edit.php +++ b/src/dede/album_edit.php @@ -378,15 +378,6 @@ function __save(){ } //生成HTML UpIndexKey($id, $arcrank, $typeid, $sortrank, $tags); - if ($cfg_remote_site == 'Y' && $isremote == "1") { - if ($serviterm != "") { - list($servurl, $servuser, $servpwd) = explode(',', $serviterm); - $config = array('hostname' => $servurl, 'username' => $servuser, 'password' => $servpwd, 'debug' => 'TRUE'); - } else { - $config = array(); - } - if (!$ftp->connect($config)) exit('Error:None FTP Connection!'); - } $arcUrl = MakeArt($id, true, true, $isremote); if ($arcUrl == '') { $arcUrl = $cfg_phpurl . "/view.php?aid=$id"; @@ -408,13 +399,13 @@ function __save(){ } //返回成功信息 $msg = " 　　请选择你的后续操作： - 继续发布图片 + 继续发布图片    - 查看更改 + 查看更改    - 预览文档 + 预览文档    - 管理已发布图片 + 管理已发布图片    $backurl "; diff --git a/src/dede/archives_add.php b/src/dede/archives_add.php index 477bd6eb..70d2cd7b 100755 --- a/src/dede/archives_add.php +++ b/src/dede/archives_add.php @@ -190,18 +190,6 @@ color,writer,source,litpic,pubdate,senddate,mid,voteid,notpost,description,keywo //生成HTML InsertTags($tags, $arcID); - if ($cfg_remote_site == 'Y' && $isremote == "1") { - if ($serviterm != "") { - list($servurl, $servuser, $servpwd) = explode(',', $serviterm); - $config = array( - 'hostname' => $servurl, 'username' => $servuser, - 'password' => $servpwd, 'debug' => 'TRUE' - ); - } else { - $config = array(); - } - if (!$ftp->connect($config)) exit('Error:None FTP Connection!'); - } $artUrl = MakeArt($arcID, true, true, $isremote); if ($artUrl == '') { $artUrl = $cfg_phpurl . "/view.php?aid=$arcID"; @@ -222,13 +210,13 @@ color,writer,source,litpic,pubdate,senddate,mid,voteid,notpost,description,keywo //返回成功信息 $msg = " 　　请选择你的后续操作： - 继续发布文档 + 继续发布文档    - 查看文档 + 查看文档    - 更改文档 + 更改文档    - 已发布文档管理 + 已发布文档管理    $backurl "; diff --git a/src/dede/archives_do.php b/src/dede/archives_do.php index eec8db0b..97ccef5a 100755 --- a/src/dede/archives_do.php +++ b/src/dede/archives_do.php @@ -594,9 +594,9 @@ function quickEdit(){ } - +    - + diff --git a/src/dede/archives_edit.php b/src/dede/archives_edit.php index fb52fd40..2b0ca517 100755 --- a/src/dede/archives_edit.php +++ b/src/dede/archives_edit.php @@ -202,15 +202,6 @@ function __save(){ } //生成HTML UpIndexKey($id, $arcrank, $typeid, $sortrank, $tags); - if ($cfg_remote_site == 'Y' && $isremote == "1") { - if ($serviterm != "") { - list($servurl, $servuser, $servpwd) = explode(',', $serviterm); - $config = array('hostname' => $servurl, 'username' => $servuser, 'password' => $servpwd, 'debug' => 'TRUE'); - } else { - $config = array(); - } - if (!$ftp->connect($config)) exit('Error:None FTP Connection!'); - } $artUrl = MakeArt($id, TRUE, TRUE, $isremote); if ($artUrl == '') { $artUrl = $cfg_phpurl . "/view.php?aid=$id"; @@ -232,13 +223,13 @@ function __save(){ } //返回成功信息 $msg = " 　　请选择你的后续操作： - 发布新文档 + 发布新文档    - 查看更改 + 查看更改    - 查看文档 + 查看文档    - 管理文档 + 管理文档    $backurl "; diff --git a/src/dede/archives_sg_add.php b/src/dede/archives_sg_add.php index 68c8ecfa..3d301a7f 100755 --- a/src/dede/archives_sg_add.php +++ b/src/dede/archives_sg_add.php @@ -150,15 +150,6 @@ function __save(){ } } //生成HTML - if ($cfg_remote_site == 'Y' && $isremote == "1") { - if ($serviterm != "") { - list($servurl, $servuser, $servpwd) = explode(',', $serviterm); - $config = array('hostname' => $servurl, 'username' => $servuser, 'password' => $servpwd, 'debug' => 'TRUE'); - } else { - $config = array(); - } - if (!$ftp->connect($config)) exit('Error:None FTP Connection!'); - } $artUrl = MakeArt($arcID, TRUE, TRUE, $isremote); if ($artUrl == '') { $artUrl = $cfg_phpurl . "/view.php?aid=$arcID"; @@ -167,15 +158,15 @@ function __save(){ } //返回成功信息 $msg = " 　　请选择你的后续操作： - 继续发布文档 + 继续发布文档    - 查看文档 + 查看文档    - 更改文档 + 更改文档    - 已发布文档管理 + 已发布文档管理    - 网站栏目管理 + 网站栏目管理 "; $wintitle = "成功发布文档！"; diff --git a/src/dede/archives_sg_edit.php b/src/dede/archives_sg_edit.php index 4939de6f..0b994f86 100755 --- a/src/dede/archives_sg_edit.php +++ b/src/dede/archives_sg_edit.php @@ -136,19 +136,6 @@ function __save(){ } //生成HTML UpIndexKey($id, $arcrank, $typeid, $sortrank, ''); - if ($cfg_remote_site == 'Y' && $isremote == "1") { - if ($serviterm != "") { - list($servurl, $servuser, $servpwd) = explode(',', $serviterm); - $config = array( - 'hostname' => $servurl, 'username' => $servuser, - 'password' => $servpwd, 'debug' => 'TRUE' - ); - } else { - $config = array(); - } - if (!$ftp->connect($config)) exit('Error:None FTP Connection!'); - } - $artUrl = MakeArt($id, TRUE, TRUE, $isremote); if ($artUrl == '') $artUrl = $cfg_phpurl . "/view.php?aid=$id"; @@ -156,15 +143,15 @@ function __save(){ } //返回成功信息 $msg = " 　　请选择你的后续操作： - 发布新文档 + 发布新文档    - 查看更改 + 查看更改    - 查看文档 + 查看文档    - 管理文档 + 管理文档    - 网站栏目管理 + 网站栏目管理 "; $wintitle = "成功更改文档！"; diff --git a/src/dede/article_add.php b/src/dede/article_add.php index b403a010..6065513a 100755 --- a/src/dede/article_add.php +++ b/src/dede/article_add.php @@ -221,15 +221,6 @@ function __save(){ } } //生成HTML InsertTags($tags, $arcID); - if ($cfg_remote_site == 'Y' && $isremote == "1") { - if ($serviterm != "") { - list($servurl, $servuser, $servpwd) = explode(',', $serviterm); - $config = array('hostname' => $servurl, 'username' => $servuser, 'password' => $servpwd, 'debug' => 'TRUE'); - } else { - $config = array(); - } - if (!$ftp->connect($config)) exit('Error:None FTP Connection!'); - } $picTitle = false; if (count($_SESSION['bigfile_info']) > 0) { foreach ($_SESSION['bigfile_info'] as $k => $v) { @@ -264,13 +255,13 @@ function __save(){ } //返回成功信息 $msg = " 　　请选择你的后续操作： - 继续发布文章 + 继续发布文章    - 查看文章 + 查看文章    - 更改文章 + 更改文章    - 已发布文章管理 + 已发布文章管理    $backurl "; diff --git a/src/dede/article_coonepage_rule.php b/src/dede/article_coonepage_rule.php index 3e9f1457..29148b88 100755 --- a/src/dede/article_coonepage_rule.php +++ b/src/dede/article_coonepage_rule.php @@ -101,8 +101,8 @@ function _EditNoteLoad(){ }   - - + + diff --git a/src/dede/article_edit.php b/src/dede/article_edit.php index fc981591..01611f5b 100755 --- a/src/dede/article_edit.php +++ b/src/dede/article_edit.php @@ -214,18 +214,6 @@ function __save(){ } //生成HTML UpIndexKey($id, $arcrank, $typeid, $sortrank, $tags); - if ($cfg_remote_site == 'Y' && $isremote == "1") { - if ($serviterm != "") { - list($servurl, $servuser, $servpwd) = explode(',', $serviterm); - $config = array( - 'hostname' => $servurl, 'username' => $servuser, - 'password' => $servpwd, 'debug' => 'TRUE' - ); - } else { - $config = array(); - } - if (!$ftp->connect($config)) exit('Error:None FTP Connection!'); - } $artUrl = MakeArt($id, true, true, $isremote); if ($artUrl == '') { $artUrl = $cfg_phpurl . "/view.php?aid=$id"; @@ -247,13 +235,13 @@ function __save(){ } //返回成功信息 $msg = " 　　请选择你的后续操作： - 发布新文章 + 发布新文章    - 查看更改 + 查看更改    - 查看文章 + 查看文章    - 管理文章 + 管理文章    $backurl "; diff --git a/src/dede/article_template_rand.php b/src/dede/article_template_rand.php index 302f5be5..219eee5a 100755 --- a/src/dede/article_template_rand.php +++ b/src/dede/article_template_rand.php @@ -98,8 +98,8 @@ function DoRand(jobname) 如果你想对旧的文章应用随机模板设置，请点击此对旧文章进行处理(必须设置好模板项)！ -   设置全部 -   取消全部 +   设置全部 +   取消全部   $okmsg diff --git a/src/dede/config.php b/src/dede/config.php index fa67db2e..3531e4a1 100755 --- a/src/dede/config.php +++ b/src/dede/config.php @@ -62,7 +62,6 @@ $isUrlOpen = @ini_get('allow_url_fopen'); $dedeNowurl = GetCurUrl(); $dedeNowurls = explode('?', $dedeNowurl); $s_scriptName = $dedeNowurls[0]; -$cfg_remote_site = empty($cfg_remote_site) ? 'N' : $cfg_remote_site; //检验用户登录状态 $cuserLogin = new userLogin(); diff --git a/src/dede/content_list.php b/src/dede/content_list.php index f78616f0..edbd3f45 100755 --- a/src/dede/content_list.php +++ b/src/dede/content_list.php @@ -159,9 +159,9 @@ if ($cid != 0) { } if ($arcrank != '') { $whereSql .= " AND arc.arcrank = '$arcrank' "; - $CheckUserSend = ""; + $CheckUserSend = ""; } else { - $CheckUserSend = ""; + $CheckUserSend = ""; } $orderby = empty($orderby) ? 'id' : preg_replace("#[^a-z0-9]#", "", $orderby); diff --git a/src/dede/content_sg_list.php b/src/dede/content_sg_list.php index 0f42cb99..571e83fb 100755 --- a/src/dede/content_sg_list.php +++ b/src/dede/content_sg_list.php @@ -64,9 +64,9 @@ if ($cid != 0) $whereSql .= " AND arc.typeid in (" . GetSonIds($cid) . ")"; if ($arcrank != '') { $whereSql .= " AND arc.arcrank = '$arcrank' "; - $CheckUserSend = ""; + $CheckUserSend = ""; } else { - $CheckUserSend = ""; + $CheckUserSend = ""; } $query = "SELECT arc.aid,arc.aid as id,arc.typeid,arc.arcrank,arc.flag,arc.senddate,arc.channel,arc.title,arc.mid,arc.click,tp.typename,ch.typename as channelname diff --git a/src/dede/css/base.css b/src/dede/css/base.css index bca4ca95..b406fb13 100755 --- a/src/dede/css/base.css +++ b/src/dede/css/base.css @@ -14,21 +14,31 @@ body { background-color: #FFF; } -form,h1,h2,h3,ul,ol,div { +form, +h1, +h2, +h3, +ul, +ol, +div { margin: 0; padding: 0; } -td,th,div { +td, +th, +div { word-break: break-all; word-wrap: break-word; } -b,strong { +b, +strong { color: #666600; } -li,dd { +li, +dd { list-style-type: none; margin: 0px; padding: 0px; @@ -47,7 +57,9 @@ select { transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; } -input[type="button"],input[type="submit"],input[type="reset"] { +input[type="button"], +input[type="submit"], +input[type="reset"] { border: none; border-right: 1px solid #ACACAC; border-bottom: 1px solid #ACACAC; @@ -58,7 +70,8 @@ input[type="button"],input[type="submit"],input[type="reset"] { cursor: pointer; } -input[type="text"],input[type="password"] { +input[type="text"], +input[type="password"] { font-size: 1rem; font-weight: 400; color: #495057; @@ -73,593 +86,605 @@ input[type="text"],input[type="password"] { vertical-align: middle; } -input[type="text"]:focus,input[type="password"]:focus { -border-color: #A5C760; -color: #333; --moz-box-shadow: 0 0 3px #A5C760; --webkit-box-shadow: 0 0 3px #A5C760; -box-shadow: 0 0 3px #A5C760; -outline: none; +input[type="text"]:focus, +input[type="password"]:focus { + border-color: #A5C760; + color: #333; + -moz-box-shadow: 0 0 3px #A5C760; + -webkit-box-shadow: 0 0 3px #A5C760; + box-shadow: 0 0 3px #A5C760; + outline: none; } -input:disabled, input[readonly] { - background-color: #e9ecef; - opacity: 1; +input:disabled, +input[readonly] { + background-color: #e9ecef; + opacity: 1; } label { - display: inline-block; - margin: .5rem 0; + display: inline-block; + margin: .5rem 0; } .alltxt { -line-height: 18px; -padding: 3px 3px 2px 3px; -vertical-align: middle; -border-width: 1px; -border-style: solid; -border-color: #707070 #CECECE #CECECE #707070; + line-height: 18px; + padding: 3px 3px 2px 3px; + vertical-align: middle; + border-width: 1px; + border-style: solid; + border-color: #707070 #CECECE #CECECE #707070; } textarea { -font-size: 1rem; -font-weight: 400; -color: #495057; -background-color: #fff; -background-clip: padding-box; -border: 1px solid #ced4da; -border-radius: .25rem; -transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; -padding: 2px 4px; -vertical-align: middle; -line-height: 16px; -overflow: auto; -resize: vertical; + font-size: 1rem; + font-weight: 400; + color: #495057; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #ced4da; + border-radius: .25rem; + transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; + padding: 2px 4px; + vertical-align: middle; + line-height: 16px; + overflow: auto; + resize: vertical; } textarea:focus { -border-color: #A5C760; -color: #333; --moz-box-shadow: 0 0 3px #A5C760; --webkit-box-shadow: 0 0 3px #A5C760; -box-shadow: 0 0 3px #A5C760; + border-color: #A5C760; + color: #333; + -moz-box-shadow: 0 0 3px #A5C760; + -webkit-box-shadow: 0 0 3px #A5C760; + box-shadow: 0 0 3px #A5C760; } h1 { -color: #171B16; -font-size: 130%; -font-weight: bold; + color: #171B16; + font-size: 130%; + font-weight: bold; } h2 { -color: #171B16; -font-size: 115%; -font-weight: bold; + color: #171B16; + font-size: 115%; + font-weight: bold; } h3 { -color: #171B16; -font-size: 100%; -font-weight: bold; + color: #171B16; + font-size: 100%; + font-weight: bold; } a:link { -font-size: 9pt; -color: #000000; -text-decoration: none; -font-family: ""宋体""; + font-size: 9pt; + color: #000000; + text-decoration: none; + font-family: ""宋体""; } a:visited { -font-size: 9pt; -color: #000000; -text-decoration: none; -font-family: ""宋体""; + font-size: 9pt; + color: #000000; + text-decoration: none; + font-family: ""宋体""; } a:hover { -color: red; -font-family: ""宋体""; + color: red; + font-family: ""宋体""; } a img { -border-style: none; + border-style: none; } b a { -color: #666600; + color: #666600; } strong a { -color: #666600; + color: #666600; } a b { -color: #666600; + color: #666600; } a strong { -color: #666600; + color: #666600; } .pubinputs { -height: 16px; -line-height: 16px; -width: 250px; -padding: 4px 0px 2px 0px; -border-width: 1px; -border-style: solid; -border-color: #999999 #dddddd #dddddd #999999; + height: 16px; + line-height: 16px; + width: 250px; + padding: 4px 0px 2px 0px; + border-width: 1px; + border-style: solid; + border-color: #999999 #dddddd #dddddd #999999; } .iptxt { -height: 14px; -line-height: 14px; -padding: 4px 3px 2px 3px; -border-width: 1px; -border-style: solid; -border-color: #999999 #dddddd #dddddd #999999; + height: 14px; + line-height: 14px; + padding: 4px 3px 2px 3px; + border-width: 1px; + border-style: solid; + border-color: #999999 #dddddd #dddddd #999999; } .pubinput { -height: 24px; -width: 250px; -padding-top: 3px; -padding-bottom: 0px; + height: 24px; + width: 250px; + padding-top: 3px; + padding-bottom: 0px; } .pubinputl { -height: 24px; -width: 350px; -padding-top: 3px; -padding-bottom: 0px; + height: 24px; + width: 350px; + padding-top: 3px; + padding-bottom: 0px; } .np { -border: none; + border: none; } .linerow { -border-bottom: 1px solid #ACACAC; + border-bottom: 1px solid #ACACAC; } .coolbg { -border: none; -border-right: 1px solid #ACACAC; -border-bottom: 1px solid #ACACAC; -padding: 2px; -padding-right: 5px; -padding-left: 5px; -background: #CCC url(../images/allbtbg2.gif); -cursor: pointer; + border: none; + border-right: 1px solid #ACACAC; + border-bottom: 1px solid #ACACAC; + padding: 2px; + padding-right: 5px; + padding-left: 5px; + background: #CCC url(../images/allbtbg2.gif); + cursor: pointer; } .coolbg2 { -border: 1px solid #000000; -background-color: #DFDDD2; -height: 18px + border: 1px solid #000000; + background-color: #DFDDD2; + height: 18px } .ll { -border-right: 2px solid #ACACAC; -border-bottom: 2px solid #ACACAC; -background-color: #E6E6E6 + border-right: 2px solid #ACACAC; + border-bottom: 2px solid #ACACAC; + background-color: #E6E6E6 } .bline { -border-bottom: 1px dotted #BCBCBC; -height: 36px; -background-color: #FFFFFF; + border-bottom: 1px dotted #BCBCBC; + height: 36px; + background-color: #FFFFFF; } #uploadfield { -float: left; + float: left; } .bline2 { -border-bottom: 1px solid #BCBCBC; + border-bottom: 1px solid #BCBCBC; } .coolbt { -border-left: 1px solid #EFEFEF; -border-top: 1px solid #EFEFEF; -border-right: 1px solid #ACACAC; -border-bottom: 1px solid #ACACAC; -background-color: #E4F7D7; -cursor: pointer; + border-left: 1px solid #EFEFEF; + border-top: 1px solid #EFEFEF; + border-right: 1px solid #ACACAC; + border-bottom: 1px solid #ACACAC; + background-color: #E4F7D7; + cursor: pointer; } .coolbt2 { -border-left: 1px solid #EFEFEF; -border-top: 1px solid #EFEFEF; -border-right: 1px solid #ACACAC; -border-bottom: 1px solid #ACACAC; -background-color: #F7FCDA + border-left: 1px solid #EFEFEF; + border-top: 1px solid #EFEFEF; + border-right: 1px solid #ACACAC; + border-bottom: 1px solid #ACACAC; + background-color: #F7FCDA } .coolbg3 { -border: 1px solid #BDC5B4; -background-color: #DFDDD2; -height: 20px; -width: 140px; -text-align: right; + border: 1px solid #BDC5B4; + background-color: #DFDDD2; + height: 20px; + width: 140px; + text-align: right; } .coolbg61 { -line-height: 26px; -width: 380px; -border-top: 1px solid #BDC5B4; -border-left: 1px solid #BDC5B4; -border-right: 1px solid #BDC5B4; -height: 26px; -text-align: right; -background-color: #E7F3B1; + line-height: 26px; + width: 380px; + border-top: 1px solid #BDC5B4; + border-left: 1px solid #BDC5B4; + border-right: 1px solid #BDC5B4; + height: 26px; + text-align: right; + background-color: #E7F3B1; } .coolbg62 { -border: 1px solid #BDC5B4; -background-color: #F8FDF0; -height: 300px; -width: 380px; -padding: 5px; + border: 1px solid #BDC5B4; + background-color: #F8FDF0; + height: 300px; + width: 380px; + padding: 5px; } .coolbg4 { -border-bottom: 1px solid #C9CFC1; -background-color: #F9FCDC; -background: url(../images/dlgtitle.gif) repeat-x; -height: 24px; -line-height: 24px; -width: 190px; -text-align: right; + border-bottom: 1px solid #C9CFC1; + background-color: #F9FCDC; + background: url(../images/dlgtitle.gif) repeat-x; + height: 24px; + line-height: 24px; + width: 190px; + text-align: right; } .coolbg5 { -border-top: 1px solid #BDC5B4; -background-color: #F9FCDC; -font-size: 1pt; -height: 6px; -width: 190px; + border-top: 1px solid #BDC5B4; + background-color: #F9FCDC; + font-size: 1pt; + height: 6px; + width: 190px; } .wsselect { -height: 60px; -line-height: 24px - overflow-y:auto; -overflow: auto; -background-color: #FCFEF1; -scrollbar-face-color: #ffffff; -scrollbar-highlight-color: #919192; -scrollbar-shadow-color: #919192; -scrollbar-3dlight-color: #ffffff; -scrollbar-arrow-color: #919192; -scrollbar-track-color: #ffffff; -scrollbar-darkshadow-color: #ffffff; + height: 60px; + line-height: 24px overflow-y:auto; + overflow: auto; + background-color: #FCFEF1; + scrollbar-face-color: #ffffff; + scrollbar-highlight-color: #919192; + scrollbar-shadow-color: #919192; + scrollbar-3dlight-color: #ffffff; + scrollbar-arrow-color: #919192; + scrollbar-track-color: #ffffff; + scrollbar-darkshadow-color: #ffffff; } .dlg { -border: 2px solid #749F4D; -background-color: #F0FAEB; -padding: 2px; -width: 360px; -line-height: 160%; + border: 2px solid #749F4D; + background-color: #F0FAEB; + padding: 2px; + width: 360px; + line-height: 160%; } .pubdlg { -z-index: 8888; -border: 5px solid #749F4D; -background-color: #fff; + z-index: 8888; + border: 5px solid #749F4D; + background-color: #fff; } .pubdlg .title { -border-bottom: 1px solid #C9CFC1; -background-color: #F9FCDC; -background: url(../images/dlgtitle.gif) repeat-x; -height: 28px; -line-height: 28px; -text-align: left; -cursor: move; + border-bottom: 1px solid #C9CFC1; + background-color: #F9FCDC; + background: url(../images/dlgtitle.gif) repeat-x; + height: 28px; + line-height: 28px; + text-align: left; + cursor: move; } .pubdlg .titLeft { -float: left; -padding-left: 8px; -line-height: 28px; -font-weight: bold; -color: #555; + float: left; + padding-left: 8px; + line-height: 28px; + font-weight: bold; + color: #555; } .pubdlg .titRight { -float: right; -padding: 0px; + float: right; + padding: 0px; } .fullpagediv { -z-index: 1999; -top: 0; -left: 0; -background: #cdcdcd; -filter: Alpha(opacity=50); --moz-opacity: .5; -opacity: 0.5; -position: absolute; -width: 100%; -height: 120%; + z-index: 1999; + top: 0; + left: 0; + background: #cdcdcd; + filter: Alpha(opacity=50); + -moz-opacity: .5; + opacity: 0.5; + position: absolute; + width: 100%; + height: 120%; } .quicksel { -z-index: 10005; -width: 680px; -height: 420px; -margin-left: 5px; -margin-top: 5px; -overflow: auto; -scrollbar-face-color: #ffffff; -scrollbar-highlight-color: #919192; -scrollbar-shadow-color: #919192; -scrollbar-3dlight-color: #ffffff; -scrollbar-arrow-color: #919192; -scrollbar-track-color: #ffffff; -scrollbar-darkshadow-color: #ffffff; + z-index: 10005; + width: 680px; + height: 420px; + margin-left: 5px; + margin-top: 5px; + overflow: auto; + scrollbar-face-color: #ffffff; + scrollbar-highlight-color: #919192; + scrollbar-shadow-color: #919192; + scrollbar-3dlight-color: #ffffff; + scrollbar-arrow-color: #919192; + scrollbar-track-color: #ffffff; + scrollbar-darkshadow-color: #ffffff; } .quickselfoot { -padding-top: 8px; -border-top: 1px dashed #C0CC9D; + padding-top: 8px; + border-top: 1px dashed #C0CC9D; } .quickselItem { -margin-bottom: 8px; + margin-bottom: 8px; } .quickselItem .topcat { -font-weight: bold; -clear: both; -line-height: 24px; -border-bottom: 1px dashed #ccc; -background: #FBFEEF; -padding-left: 5px; + font-weight: bold; + clear: both; + line-height: 24px; + border-bottom: 1px dashed #ccc; + background: #FBFEEF; + padding-left: 5px; } .quickselItem .soncat { -padding-left: 10px; + padding-left: 10px; } .quickselItem .item { -float: left; -margin-right: 8px; + float: left; + margin-right: 8px; } -.mysource,.mywriter { -z-index: 10001; -border: 5px solid #749F4D; -background-color: #F0FAEB; -padding: 2px; -width: 280px; -line-height: 160%; +.mysource, +.mywriter { + z-index: 10001; + border: 5px solid #749F4D; + background-color: #F0FAEB; + padding: 2px; + width: 280px; + line-height: 160%; } .dlgws div { -width: 100%; + width: 100%; } .dlgTesttitle { -border: 2px solid #749F4D; -background-color: #F0FAEB; -padding: 2px; -width: 300px; -line-height: 150%; + border: 2px solid #749F4D; + background-color: #F0FAEB; + padding: 2px; + width: 300px; + line-height: 150%; } #_mysource { -z-index: 10003; + z-index: 10003; } #_mywriter { -z-index: 10004; + z-index: 10004; } #uploadwait { -z-index: 19999; + z-index: 19999; } .option1 { -background-color: #DCECA6; + background-color: #DCECA6; } .option2 { -background-color: #F7FBD2; + background-color: #F7FBD2; } .option3 { -background-color: #FFFFFF; + background-color: #FFFFFF; } .ininput { -width: 96%; -height: 20px; -border: 1px solid #ffffff; + width: 96%; + height: 20px; + border: 1px solid #ffffff; } .nbt { -padding: 1px; -background-image: url('../images/allbtbg.gif'); -background-color: #ffffff; -border: 1px solid #A5AF83; + padding: 1px; + background-image: url('../images/allbtbg.gif'); + background-color: #ffffff; + border: 1px solid #A5AF83; } .tdt { -padding-left: 6px; + padding-left: 6px; } .waitpage { -top: 0; -left: 0; -filter: Alpha(opacity=70); --moz-opacity: 0.7; -position: absolute; -z-index: 10000; -background: url(../../images/loading1.gif) #ababab center no-repeat; + top: 0; + left: 0; + filter: Alpha(opacity=70); + -moz-opacity: 0.7; + position: absolute; + z-index: 10000; + background: url(../../images/loading1.gif) #ababab center no-repeat; } .divpre img { -max-width: 150px; -max-height: 100px; + max-width: 150px; + max-height: 100px; } .divpre { -overflow: hidden; + overflow: hidden; } .autoinput { -padding-left: 3px; -width: 90%; + padding-left: 3px; + width: 90%; } .bodytitle { -margin: auto; -height: 28px; -border: 1px dotted #BFD67C; -background: url('../images/wbg.gif'); -margin-bottom: 6px; -width: 98%; -font-weight: bold; + margin: auto; + height: 28px; + border: 1px dotted #BFD67C; + background: url('../images/wbg.gif'); + margin-bottom: 6px; + width: 98%; + font-weight: bold; } .bodytitle div { -float: left + float: left } .bodytitletxt { -padding-left: 6px; -line-height: 28px; + padding-left: 6px; + line-height: 28px; } .tbtitle td { -padding: 3px; + padding: 3px; } .tblist td { -background: #FFFFFF; -padding: 6px; + background: #FFFFFF; + padding: 6px; } .tblist td.tbsname { -background: #F9FFE6; -padding: 6px; + background: #F9FFE6; + padding: 6px; } .colordlg { -width: 100px; -z-index;10005;border: 2px dashed #749F4D; -background-color: #F0FAEB; -padding: 2px; -line-height: 160%; + width: 100px; + z-index; + 10005; + border: 2px dashed #749F4D; + background-color: #F0FAEB; + padding: 2px; + line-height: 160%; } option.alltype { -height: 18px; -line-height: 18px; -font-size: 12px; -padding-left: 16px; -background: url(../images/arr4.gif) 3px 4px no-repeat; + height: 18px; + line-height: 18px; + font-size: 12px; + padding-left: 16px; + background: url(../images/arr4.gif) 3px 4px no-repeat; } option.btype { -height: 18px; -line-height: 18px; -font-size: 12px; -padding-left: 16px; -background: url(../images/arr4.gif) 3px 4px no-repeat; + height: 18px; + line-height: 18px; + font-size: 12px; + padding-left: 16px; + background: url(../images/arr4.gif) 3px 4px no-repeat; } option.stype { -height: 18px; -line-height: 18px; -font-size: 12px; -padding-left: 24px; -background: url(../images/arrr.gif) 11px 4px no-repeat; + height: 18px; + line-height: 18px; + font-size: 12px; + padding-left: 24px; + background: url(../images/arrr.gif) 11px 4px no-repeat; } .ilist { -border-top: 1px dashed #BCBCBC; -border-bottom: 1px dashed #BCBCBC; -border-left: 1px dashed #BCBCBC; + border-top: 1px dashed #BCBCBC; + border-bottom: 1px dashed #BCBCBC; + border-left: 1px dashed #BCBCBC; } .ilist td { -border-right: 1px dashed #BCBCBC; + border-right: 1px dashed #BCBCBC; } #typeid2 { -border: 0px; -padding: 0px; -background: #ccc; -height: 18px; -font-size: 12px; -padding-left: 10px; -background: url(../images/typeid2bg.gif) no-repeat; -float: left; + border: 0px; + padding: 0px; + background: #ccc; + height: 18px; + font-size: 12px; + padding-left: 10px; + background: url(../images/typeid2bg.gif) no-repeat; + float: left; } .litpic_span { -width: 77px; -overflow: hidden; -height: 21px; -*vertical-align: 3px; -margin-left: -60px; -*margin-left: -75px; -cursor: pointer; + width: 77px; + overflow: hidden; + height: 21px; + *vertical-align: 3px; + margin-left: -60px; + *margin-left: -75px; + cursor: pointer; } #litpic { -width: 85px; -height: 20px; -margin-left: -20px; -filter: alpha(opacity=00); --moz-opacity: .0; -opacity: 0.0; -cursor: pointer; + width: 85px; + height: 20px; + margin-left: -20px; + filter: alpha(opacity=00); + -moz-opacity: .0; + opacity: 0.0; + cursor: pointer; } -#starttime,#endtime,#pubdate { -background: url(../images/calendar.gif) 3px no-repeat; -padding-left: 23px; +#starttime, +#endtime, +#pubdate { + background: url(../images/calendar.gif) 3px no-repeat; + padding-left: 23px; } #title { -background: url(../images/ruler.gif) repeat-x 0px 10px; + background: url(../images/ruler.gif) repeat-x 0px 10px; } .spec { -width: 60px; + width: 60px; } .gtab a { -width: 80px; -text-align: center; -display: block; -float: left; -height: 26px; -line-height: 26px; + width: 80px; + text-align: center; + display: block; + float: left; + height: 26px; + line-height: 26px; } .albCt img { -cursor: pointer; + cursor: pointer; } img { -vertical-align: baseline; + vertical-align: baseline; } .maintable { - width: 98%!important; + width: 98% !important; } + a.btn { - color: white!important; + color: white !important; } span.page-link { background-color: #DDD; +} + +.btn-success { + background-color: #28a745; + border-color: #28a745; } \ No newline at end of file diff --git a/src/dede/dialog/config.php b/src/dede/dialog/config.php index 3ed0f190..ed3c38ad 100755 --- a/src/dede/dialog/config.php +++ b/src/dede/dialog/config.php @@ -35,23 +35,3 @@ if ($cuserLogin->getUserID() <= 0) { echo ""; exit(); } - -//启用远程站点则创建FTP类 -if ($cfg_remote_site == 'Y') { - require_once(DEDEINC . '/ftp.class.php'); - if (file_exists(DEDEDATA . "/cache/inc_remote_config.php")) { - require_once DEDEDATA . "/cache/inc_remote_config.php"; - } - if (empty($remoteuploads)) $remoteuploads = 0; - if (empty($remoteupUrl)) $remoteupUrl = ''; - //初始化FTP配置 - $ftpconfig = array( - 'hostname' => $rmhost, - 'port' => $rmport, - 'username' => $rmname, - 'password' => $rmpwd - - ); - $ftp = new FTP; - $ftp->connect($ftpconfig); -} diff --git a/src/dede/dialog/select_images.php b/src/dede/dialog/select_images.php index 99c3ca36..e23c6e9f 100755 --- a/src/dede/dialog/select_images.php +++ b/src/dede/dialog/select_images.php @@ -202,11 +202,7 @@ if (!empty($noeditor)) { } else if (preg_match("#\.(" . $cfg_imgtype . ")#i", $file)) { $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); - if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { - $reurl = $remoteupUrl . $reurl; - } else { - $reurl = $reurl; - } + $reurl = $reurl; if ($file == $comeback) $lstyle = " style='color:red' "; else $lstyle = ""; @@ -224,11 +220,7 @@ if (!empty($noeditor)) { } else if (preg_match("#\.(jpg)#i", $file)) { $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); - if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { - $reurl = $remoteupUrl . $reurl; - } else { - $reurl = $reurl; - } + $reurl = $reurl; if ($file == $comeback) $lstyle = " style='color:red' "; else $lstyle = ""; @@ -267,7 +259,7 @@ if (!empty($noeditor)) { 宽： 高： - + diff --git a/src/dede/dialog/select_images_post.php b/src/dede/dialog/select_images_post.php index 611828d4..47a3b056 100755 --- a/src/dede/dialog/select_images_post.php +++ b/src/dede/dialog/select_images_post.php @@ -56,15 +56,7 @@ $filename = $filename . '.' . $fs[count($fs) - 1]; $filename_name = $filename_name . '.' . $fs[count($fs) - 1]; $fullfilename = $cfg_basedir . $activepath . "/" . $filename; move_uploaded_file($imgfile, $fullfilename) or die("上传文件到 $fullfilename 失败！"); -if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { - //分析远程文件路径 - $remotefile = str_replace(DEDEROOT, '', $fullfilename); - $localfile = '../..' . $remotefile; - //创建远程文件夹 - $remotedir = preg_replace('/[^\/]*\.(jpg|gif|bmp|png)/', '', $remotefile); - $ftp->rmkdir($remotedir); - $ftp->upload($localfile, $remotefile); -} + @unlink($imgfile); if (empty($resize)) { $resize = 0; diff --git a/src/dede/dialog/select_media.php b/src/dede/dialog/select_media.php index 60bef13b..0457d069 100755 --- a/src/dede/dialog/select_media.php +++ b/src/dede/dialog/select_media.php @@ -129,11 +129,7 @@ if (!empty($noeditor)) { } else if (preg_match("#\.(swf|fly|fla|flv)#i", $file)) { $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); - if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { - $reurl = $remoteupUrl . $reurl; - } else { - $reurl = $reurl; - } + $reurl = $reurl; if ($file == $comeback) $lstyle = " style='color:red' "; else $lstyle = ""; @@ -150,11 +146,7 @@ if (!empty($noeditor)) { $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); - if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { - $reurl = $remoteupUrl . $reurl; - } else { - $reurl = $reurl; - } + $reurl = $reurl; if ($file == $comeback) $lstyle = " style='color:red' "; else $lstyle = ""; @@ -170,11 +162,7 @@ if (!empty($noeditor)) { } else if (preg_match("#\.(rm|rmvb)#i", $file)) { $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); - if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { - $reurl = $remoteupUrl . $reurl; - } else { - $reurl = $reurl; - } + $reurl = $reurl; if ($file == $comeback) $lstyle = " style='color:red' "; else $lstyle = ""; @@ -191,11 +179,7 @@ if (!empty($noeditor)) { $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); - if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { - $reurl = $remoteupUrl . $reurl; - } else { - $reurl = $reurl; - } + $reurl = $reurl; if ($file == $comeback) $lstyle = " style='color:red' "; else $lstyle = ""; @@ -224,7 +208,7 @@ if (!empty($noeditor)) { -  上　传：   +  上　传：   diff --git a/src/dede/dialog/select_soft.php b/src/dede/dialog/select_soft.php index 5352af45..226c5a09 100755 --- a/src/dede/dialog/select_soft.php +++ b/src/dede/dialog/select_soft.php @@ -90,7 +90,7 @@ if (!empty($noeditor)) {   改 名：   - + @@ -150,11 +150,7 @@ if (!empty($noeditor)) { $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); - if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { - $reurl = $remoteupUrl . $reurl; - } else { - $reurl = $reurl; - } + $reurl = $reurl; $line = "\n @@ -172,11 +168,7 @@ if (!empty($noeditor)) { $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); - if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { - $reurl = $remoteupUrl . $reurl; - } else { - $reurl = $reurl; - } + $reurl = $reurl; $line = "\n diff --git a/src/dede/dialog/select_soft_post.php b/src/dede/dialog/select_soft_post.php index b74bf116..36815800 100755 --- a/src/dede/dialog/select_soft_post.php +++ b/src/dede/dialog/select_soft_post.php @@ -70,15 +70,6 @@ $fullfilename = $cfg_basedir . $activepath . '/' . $filename; $fullfileurl = $activepath . '/' . $filename; move_uploaded_file($uploadfile, $fullfilename) or die("上传文件到 $fullfilename 失败！"); @unlink($uploadfile); -if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { - //分析远程文件路径 - $remotefile = str_replace(DEDEROOT, '', $fullfilename); - $localfile = '../..' . $remotefile; - //创建远程文件夹 - $remotedir = preg_replace('/[^\/]*\.(' . $cfg_softtype . ')/', '', $remotefile); - $ftp->rmkdir($remotedir); - $ftp->upload($localfile, $remotefile); -} if ($uploadfile_type == 'application/x-shockwave-flash') { $mediatype = 2; diff --git a/src/dede/dialog/select_templets.php b/src/dede/dialog/select_templets.php index 3fb09935..43d1d2f8 100755 --- a/src/dede/dialog/select_templets.php +++ b/src/dede/dialog/select_templets.php @@ -230,7 +230,7 @@ if (empty($comeback)) {  上　传： 改名： - + diff --git a/src/dede/freelist_main.php b/src/dede/freelist_main.php index 5904265f..933ddf42 100755 --- a/src/dede/freelist_main.php +++ b/src/dede/freelist_main.php @@ -88,9 +88,9 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid') {$row['templet']} {$row['click']} ".MyDate("y-m-d",$row['edtime'])." - 更改 - 更新 - 删除 + 更改 + 更新 + 删除 "; echo $line; diff --git a/src/dede/inc/grouplist.txt b/src/dede/inc/grouplist.txt index ff861aa1..56f70c95 100755 --- a/src/dede/inc/grouplist.txt +++ b/src/dede/inc/grouplist.txt @@ -65,7 +65,6 @@ >sys_Group>系统组管理 >sys_MdPwd>更改个人密码 >sys_DelUpload>删除附件 ->sys_Task>计划任务管理 >sys_Edit>修改系统参数 >sys_Log>管理日志 >sys_plus>插件管理 diff --git a/src/dede/inc/inc_action_info.php b/src/dede/inc/inc_action_info.php index 2266a00e..b2c3d8b5 100755 --- a/src/dede/inc/inc_action_info.php +++ b/src/dede/inc/inc_action_info.php @@ -429,12 +429,6 @@ $actionSearch[10] = array( 'purview' => 'sys_StringMix', 'linkurl' => 'article_template_rand.php' ), - 10 => array( - 'title' => '计划任务管理', - 'description' => '可以添加一个指定时间运行的程序', - 'purview' => 'sys_task', - 'linkurl' => 'sys_task.php' - ), 11 => array( 'title' => '数据库备份/还原', 'description' => '对数据库进行备份和还原', diff --git a/src/dede/inc/inc_archives_functions.php b/src/dede/inc/inc_archives_functions.php index 6b2c2b70..06afcd42 100755 --- a/src/dede/inc/inc_archives_functions.php +++ b/src/dede/inc/inc_archives_functions.php @@ -14,7 +14,7 @@ require_once(DEDEINC . '/image.func.php'); require_once(DEDEINC . '/archives.func.php'); require_once(DEDEINC . '/arc.partview.class.php'); $backurl = !empty($_COOKIE['ENV_GOBACK_URL']) ? $_COOKIE['ENV_GOBACK_URL'] : ''; -$backurl = preg_match("#content_#", $backurl) ? "记忆的列表页  " : ''; +$backurl = preg_match("#content_#", $backurl) ? "记忆的列表页  " : ''; if (!isset($_NOT_ARCHIVES)) { require_once(DEDEINC . '/customfields.func.php'); } diff --git a/src/dede/inc/inc_menu.php b/src/dede/inc/inc_menu.php index 77af5265..ff53c722 100755 --- a/src/dede/inc/inc_menu.php +++ b/src/dede/inc/inc_menu.php @@ -64,7 +64,6 @@ if ($cuserLogin->getUserType() >= 10) { - @@ -82,7 +81,6 @@ if ($cuserLogin->getUserType() >= 10) { "; } -$remoteMenu = ($cfg_remote_site == 'Y') ? "" : ""; $menusMain = " ----------------------------------------------- @@ -122,7 +120,6 @@ $adminMenu1 - {$remoteMenu} diff --git a/src/dede/inc/inc_menu_map.php b/src/dede/inc/inc_menu_map.php index a79e00d3..24f4112a 100755 --- a/src/dede/inc/inc_menu_map.php +++ b/src/dede/inc/inc_menu_map.php @@ -108,7 +108,6 @@ $menusMain = " - diff --git a/src/dede/index_testenv.php b/src/dede/index_testenv.php index f0abd1bc..291b38a2 100755 --- a/src/dede/index_testenv.php +++ b/src/dede/index_testenv.php @@ -137,7 +137,7 @@ if (IsWritable(DEDEDATA . '/common.inc.php')) { } $rs = TestAdminPWD(); if ($rs < 0) { - $linkurl = "马上修改"; + $linkurl = "马上修改"; switch ($rs) { case -1: $msg = "没有更改默认管理员名称admin，建议您修改为其他管理账号！{$linkurl}"; diff --git a/src/dede/js/contextmenu.css b/src/dede/js/contextmenu.css index 9e27211e..32e6f115 100755 --- a/src/dede/js/contextmenu.css +++ b/src/dede/js/contextmenu.css @@ -1,94 +1,86 @@ a { - font-size:12px; - } - .WebFX-ContextMenu { - border: 0;/*2px outset;*/ + font-size: 12px; + } + + .WebFX-ContextMenu { + border: 0; + /*2px outset;*/ width: 10px; - } + } -.WebFX-ContextMenu-Body { + .WebFX-ContextMenu-Body { background-color: #EEFFEC; - background-image:url('../images/mmenubg.gif'); - margins: 0px; - padding: 1px; + background-image: url('../images/mmenubg.gif'); + margin: 0px; + padding: 1px; border: 1px solid #E0E7C9; - } - - .WebFX-ContextMenu-Separator - { - font-size: 0pt; - border: 1px dotted #E0E7C9; - height: 1px; - overflow: hidden; + } + + .WebFX-ContextMenu-Separator { + font-size: 0pt; + border: 1px dotted #E0E7C9; + height: 1px; + overflow: hidden; margin: 3px 1px 3px 1px; } - -.WebFX-ContextMenu-Item { - cursor: default; - font: menu; - color: black!important; - width: 100%; + + .WebFX-ContextMenu-Item { + cursor: default; + font: menu; + font-size: 13px; + color: black !important; + width: 100%; padding: 2px 20px 2px 16px; - } + } -.WebFX-ContextMenu-Over { - cursor: default; - background-color: highlight; - font: menu; - width: 100%; + .WebFX-ContextMenu-Over { + cursor: default; + background-color: highlight; + font: menu; + font-size: 13px; + width: 100%; padding: 2px 20px 2px 16px; color: highlighttext; - } + } -.WebFX-ContextMenu-Disabled { - cursor: default; + .WebFX-ContextMenu-Disabled { + cursor: default; font: menu; - width: 100%; + width: 100%; padding: 2px 20px 2px 16px; - color:graytext; - } + color: graytext; + } -.WebFX-ContextMenu-Disabled-Over { - cursor: default; - background-color: highlight; - font: menu; - width: 100%; + .WebFX-ContextMenu-Disabled-Over { + cursor: default; + background-color: highlight; + font: menu; + width: 100%; padding: 2px 20px 2px 16px; color: graytext; - } - -.WebFX-ContextMenu-Disabled-Over .WebFX-ContextMenu-DisabledContainer - { - display: block; - width: 100%; - vertical-align: center; -} + } -/*very nice hack by erik below */ -.WebFX-ContextMenu-Disabled .WebFX-ContextMenu-DisabledContainer - { - display: block; - background: GrayText; - filter: chroma(color=#010101) dropshadow(color=ButtonHighlight, offx=1, offy=1); - width: 100%; - vertical-align: center; -} + .WebFX-ContextMenu-Disabled-Over .WebFX-ContextMenu-DisabledContainer { + display: block; + width: 100%; + vertical-align: center; + } -.WebFX-ContextMenu-Disabled .WebFX-ContextMenu-DisabledContainer .WebFX-ContextMenu-DisabledContainer -{ - background: Transparent; - filter: gray() - /* Remove all bright shades of gray */ - chroma(color=#ffffff) chroma(color=#fefefe) chroma(color=#fdfdfd) - chroma(color=#fcfcfc) chroma(color=#fbfbfb) chroma(color=#fafafa) - chroma(color=#f9f9f9) chroma(color=#f8f8f8) chroma(color=#f7f7f7) - chroma(color=#f6f6f6) chroma(color=#f5f5f5) chroma(color=#f4f4f4) - chroma(color=#f3f3f3) - mask(color=#010101); -} + /*very nice hack by erik below */ + .WebFX-ContextMenu-Disabled .WebFX-ContextMenu-DisabledContainer { + display: block; + background: GrayText; + filter: chroma(color=#010101) dropshadow(color=ButtonHighlight, offx=1, offy=1); + width: 100%; + vertical-align: center; + } -.WebFX-ContextMenu-Disabled-Over .WebFX-ContextMenu-DisabledContainer .WebFX-ContextMenu-DisabledContainer -{ + .WebFX-ContextMenu-Disabled .WebFX-ContextMenu-DisabledContainer .WebFX-ContextMenu-DisabledContainer { + background: Transparent; + filter: gray() + /* Remove all bright shades of gray */ + chroma(color=#ffffff) chroma(color=#fefefe) chroma(color=#fdfdfd) chroma(color=#fcfcfc) chroma(color=#fbfbfb) chroma(color=#fafafa) chroma(color=#f9f9f9) chroma(color=#f8f8f8) chroma(color=#f7f7f7) chroma(color=#f6f6f6) chroma(color=#f5f5f5) chroma(color=#f4f4f4) chroma(color=#f3f3f3) mask(color=#010101); + } -} \ No newline at end of file + .WebFX-ContextMenu-Disabled-Over .WebFX-ContextMenu-DisabledContainer .WebFX-ContextMenu-DisabledContainer {} \ No newline at end of file diff --git a/src/dede/js/main.js b/src/dede/js/main.js index abccb8f0..44c91440 100755 --- a/src/dede/js/main.js +++ b/src/dede/js/main.js @@ -758,7 +758,7 @@ $(document).ready(function () { // 截取缩略图 function SetThumb(srcURL) { var footer = - "

使用原图 确定

"; + "

使用原图 确定

"; var optButton = `

删除"; - else $needmsg = ''; + else $needmsg = ''; $nForm .= "
软件地址{$newRowStart}： 服务器名称： @@ -299,15 +299,15 @@ function __save(){ } //返回成功信息 $msg = " 　　请选择你的后续操作： - 发布新软件 + 发布新软件    - 继续修改 + 继续修改    - 查看软件 + 查看软件    - 已发布软件管理 + 已发布软件管理    - 网站栏目管理 + 网站栏目管理 "; $wintitle = "成功修改一个软件！"; $wecome_info = "文章管理::修改软件"; diff --git a/src/dede/spec_add.php b/src/dede/spec_add.php index 13501ed0..ef76e206 100755 --- a/src/dede/spec_add.php +++ b/src/dede/spec_add.php @@ -220,11 +220,11 @@ function __save(){ } //返回成功信息 $msg = " 　　请选择你的后续操作： - 创建新专题 + 创建新专题    - 查看专题 + 查看专题    - 已发布专题管理 + 已发布专题管理 "; $wintitle = "成功创建专题！"; $wecome_info = "文章管理::发布专题"; diff --git a/src/dede/spec_edit.php b/src/dede/spec_edit.php index a2cb52be..9a631d4c 100755 --- a/src/dede/spec_edit.php +++ b/src/dede/spec_edit.php @@ -248,13 +248,13 @@ function __save(){ } //返回成功信息 $msg = "　　请选择你的后续操作： - 发布新专题 + 发布新专题    - 查看更改 + 查看更改    - 查看专题 + 查看专题    - 已发布专题管理 "; + 已发布专题管理 "; $wintitle = "成功更改一个专题！"; $wecome_info = "专题管理::更改专题"; $win = new OxWindow(); diff --git a/src/dede/sys_safetest.php b/src/dede/sys_safetest.php index 61736583..da0918bd 100755 --- a/src/dede/sys_safetest.php +++ b/src/dede/sys_safetest.php @@ -61,9 +61,9 @@ function TestOneFile($f) $message .= "
可疑文件：{$trfile}
- 更改记录 - 删除 - 查看源码 + 更改记录 + 删除 + 查看源码
\r\n"; return 1; } diff --git a/src/dede/sys_task.php b/src/dede/sys_task.php deleted file mode 100755 index 615d6b03..00000000 --- a/src/dede/sys_task.php +++ /dev/null @@ -1,22 +0,0 @@ -ExecuteNoneQuery("DELETE FROM `#@__sys_task` WHERE id='$id' "); - ShowMsg("成功删除一个任务！", "sys_task.php"); - exit(); -} -include DedeInclude('templets/sys_task.htm'); diff --git a/src/dede/sys_task_add.php b/src/dede/sys_task_add.php deleted file mode 100755 index b4ce49bf..00000000 --- a/src/dede/sys_task_add.php +++ /dev/null @@ -1,31 +0,0 @@ -ExecuteNoneQuery($Query); - if ($rs) { - ShowMsg('成功增加一个任务!', 'sys_task.php'); - } else { - ShowMsg('增加任务失败!' . $dsql->GetError(), 'javascript:;'); - } - exit(); -} - -include DedeInclude('templets/sys_task_add.htm'); diff --git a/src/dede/sys_task_edit.php b/src/dede/sys_task_edit.php deleted file mode 100755 index ac2c7385..00000000 --- a/src/dede/sys_task_edit.php +++ /dev/null @@ -1,42 +0,0 @@ -ExecuteNoneQuery($query); - if ($rs) { - ShowMsg('成功修改一个任务!', 'sys_task.php'); - } else { - ShowMsg('修改任务失败!' . $dsql->GetError(), 'javascript:;'); - } - exit(); -} - -$row = $dsql->GetOne("SELECT * FROM `#@__sys_task` WHERE id='$id' "); -include DedeInclude('templets/sys_task_edit.htm'); diff --git a/src/dede/templets/ad_add.htm b/src/dede/templets/ad_add.htm index 131ad0bc..bcbdea4c 100755 --- a/src/dede/templets/ad_add.htm +++ b/src/dede/templets/ad_add.htm @@ -170,7 +170,7 @@   - + diff --git a/src/dede/templets/ad_edit.htm b/src/dede/templets/ad_edit.htm index 3c94c705..ef852ce4 100755 --- a/src/dede/templets/ad_edit.htm +++ b/src/dede/templets/ad_edit.htm @@ -124,7 +124,7 @@   - + diff --git a/src/dede/templets/ad_main.htm b/src/dede/templets/ad_main.htm index 959f0a0a..5156be52 100755 --- a/src/dede/templets/ad_main.htm +++ b/src/dede/templets/ad_main.htm @@ -16,8 +16,8 @@ class="table maintable table-bordered mt-3"> - 广告管理  增加一个新广告 - 广告分类管理 + 广告管理  增加一个新广告 + 广告分类管理 @@ -38,7 +38,7 @@ 关键字： - + @@ -68,9 +68,9 @@ {dede:field.timeset function='TimeSetValue(@me)'/} {dede:field.endtime function='GetDateMk(@me)'/} - 代码 - 更改 - 删除 + 代码 + 更改 + 删除 {/dede:datalist} diff --git a/src/dede/templets/album_add.htm b/src/dede/templets/album_add.htm index 2ef2b854..87da3e42 100755 --- a/src/dede/templets/album_add.htm +++ b/src/dede/templets/album_add.htm @@ -72,7 +72,7 @@  图集列表 >> 发布新图集 - 栏目管理  + 栏目管理  @@ -174,14 +174,14 @@ @@ -328,7 +328,7 @@ @@ -360,7 +360,7 @@ +
+ onClick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>站内选择 - + 选择图片 - @@ -218,7 +218,7 @@ 选择副栏目"; + echo "选择副栏目"; } ?>  压缩包文件： + onClick="SelectSoft('form1.zipfile')" class="btn btn-success btn-sm">浏览...
 手工上传： - + 选择本地图片（支持多选） @@ -402,11 +402,11 @@
 图集来源： - 作　者： - +
@@ -450,7 +450,7 @@ 标题颜色： - + @@ -506,7 +506,7 @@  关键字： + onClick="SelectKeywords('form1.keywords');" class="btn btn-success btn-sm">浏览... @@ -545,10 +545,10 @@
- + - +
diff --git a/src/dede/templets/album_edit.htm b/src/dede/templets/album_edit.htm index 4915d3c5..0ffe1740 100755 --- a/src/dede/templets/album_edit.htm +++ b/src/dede/templets/album_edit.htm @@ -75,7 +75,7 @@ body { - +
 &dopost=listArchives">图集列表 >> 更改图集栏目管理 栏目管理 
@@ -155,15 +155,15 @@ body { @@ -266,7 +266,7 @@ if($cfg_need_typeid2=='Y') { +
 缩 略 图：
 "> + class="btn btn-success btn-sm" onClick="SelectImage('form1.picname','');">浏览... - + 选择图片 - 标题颜色： "> -
@@ -407,7 +407,7 @@ if($cfg_need_typeid2=='Y') {  压缩包文件： - + @@ -480,7 +480,7 @@ if($cfg_need_typeid2=='Y') {  增加新图片： - + 选择本地图片（支持多选） @@ -506,8 +506,8 @@ if($cfg_need_typeid2=='Y') {   - - + +
diff --git a/src/dede/templets/archives_add.htm b/src/dede/templets/archives_add.htm index 16981866..573bf0cb 100755 --- a/src/dede/templets/archives_add.htm +++ b/src/dede/templets/archives_add.htm @@ -53,7 +53,7 @@  文档列表 >> 发布文档 - 栏目管理  + 栏目管理  @@ -169,15 +169,15 @@ - - + 选择图片 - @@ -221,7 +221,7 @@ 选择副栏目"; + echo "选择副栏目"; } ?> @@ -303,10 +303,10 @@  文档来源： - + 作　者： - + @@ -328,7 +328,7 @@ 标题颜色： - + @@ -384,7 +384,7 @@
- @@ -426,10 +426,10 @@
- + - +
diff --git a/src/dede/templets/archives_edit.htm b/src/dede/templets/archives_edit.htm index d5a46394..6a9987d3 100755 --- a/src/dede/templets/archives_edit.htm +++ b/src/dede/templets/archives_edit.htm @@ -49,7 +49,7 @@  文档列表 >> 更改文档 - 栏目管理  + 栏目管理  @@ -164,16 +164,16 @@   + size="16">
"> - + 选择图片 - @@ -288,11 +288,11 @@ if($cfg_need_typeid2=='Y') {  文档来源： " - size="16"> 作　者： ">
@@ -319,7 +319,7 @@ if($cfg_need_typeid2=='Y') { 标题颜色： "> - @@ -418,9 +418,9 @@ if($cfg_need_typeid2=='Y') { - +
- +
diff --git a/src/dede/templets/archives_sg_add.htm b/src/dede/templets/archives_sg_add.htm index 87a45d9e..4860a63a 100755 --- a/src/dede/templets/archives_sg_add.htm +++ b/src/dede/templets/archives_sg_add.htm @@ -48,7 +48,7 @@ function checkSubmit()   文档列表 >> 发布文档 -   栏目管理 +   栏目管理   @@ -114,14 +114,14 @@ function checkSubmit() + onClick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>站内选择 - + 选择图片 - @@ -181,8 +181,8 @@ function checkSubmit() echo ""; ?> 快捷选择 -  栏目管理 -  增加大栏目 +  栏目管理 +  增加大栏目 @@ -202,10 +202,10 @@ function checkSubmit()
- + - +
diff --git a/src/dede/templets/archives_sg_edit.htm b/src/dede/templets/archives_sg_edit.htm index 147222d0..3a105da6 100755 --- a/src/dede/templets/archives_sg_edit.htm +++ b/src/dede/templets/archives_sg_edit.htm @@ -45,7 +45,7 @@ function checkSubmit()  文档列表 >> 更改文档 -   栏目管理 +   栏目管理 @@ -130,16 +130,16 @@ function checkSubmit()   "> - + 选择图片 - @@ -195,9 +195,9 @@ function checkSubmit()   - +
- +
diff --git a/src/dede/templets/article_add.htm b/src/dede/templets/article_add.htm index 318e0f03..c008c45b 100755 --- a/src/dede/templets/article_add.htm +++ b/src/dede/templets/article_add.htm @@ -69,7 +69,7 @@  文章列表 >> 发布文章 -     栏目管理 @@ -80,7 +80,7 @@ - +
 常规信息 单页采集...单页采集...
@@ -99,9 +99,9 @@ - +   - @@ -191,14 +191,14 @@ + onClick="SelectImage('form1.picname','small');" class='btn btn-success btn-sm'>站内选择 - + 选择图片 - @@ -221,11 +221,11 @@ - + 作　者： - + @@ -251,7 +251,7 @@ 选择副栏目"; + echo "选择副栏目"; } ?> @@ -281,7 +281,7 @@  关键字： + onClick="SelectKeywords('form1.keywords');" class='btn btn-success btn-sm'>浏览...
@@ -309,10 +309,10 @@
 文章内容：
- +
- +
@@ -421,7 +421,7 @@ 标题颜色： - @@ -512,8 +512,8 @@   - - + + diff --git a/src/dede/templets/article_coonepage_rule.htm b/src/dede/templets/article_coonepage_rule.htm index 63020976..90a1c2ba 100755 --- a/src/dede/templets/article_coonepage_rule.htm +++ b/src/dede/templets/article_coonepage_rule.htm @@ -102,7 +102,7 @@
单页采集规则管理：
增加新网址 + class="btn btn-success btn-sm">增加新网址
@@ -126,17 +126,17 @@ - 编辑 - 删除 + 编辑 + 删除 {/dede:datalist}   - 全选 - 取消 -  删除  + 全选 + 取消 +  删除  @@ -198,9 +198,9 @@   - - + diff --git a/src/dede/templets/article_description_main.htm b/src/dede/templets/article_description_main.htm index 671d2e1c..729e55b1 100755 --- a/src/dede/templets/article_description_main.htm +++ b/src/dede/templets/article_description_main.htm @@ -68,14 +68,14 @@ 自动分页　 （自动分页大小： - K，修改系统参数） + K，修改系统参数） - + diff --git a/src/dede/templets/article_edit.htm b/src/dede/templets/article_edit.htm index 5d7aa2ed..7ebeedac 100755 --- a/src/dede/templets/article_edit.htm +++ b/src/dede/templets/article_edit.htm @@ -52,7 +52,7 @@  文章列表 >> 更改文章 -   栏目管理 +   栏目管理   @@ -174,12 +174,12 @@ - + 选择图片 - @@ -200,11 +200,11 @@  文章来源： " size="16"> - + 作　者： "> - + @@ -316,7 +316,7 @@ if($cfg_need_typeid2=='Y') { 标题颜色： "> - + @@ -431,8 +431,8 @@ if($cfg_need_typeid2=='Y') { - - + +
diff --git a/src/dede/templets/article_keywords_main.htm b/src/dede/templets/article_keywords_main.htm index 8cf4c2bb..7e1d9c29 100755 --- a/src/dede/templets/article_keywords_main.htm +++ b/src/dede/templets/article_keywords_main.htm @@ -40,12 +40,12 @@
搜索： - +   -   -
@@ -65,7 +65,7 @@ 频率： - + @@ -112,9 +112,9 @@   - +   - + diff --git a/src/dede/templets/article_keywords_make.htm b/src/dede/templets/article_keywords_make.htm index 16f77193..e11239f2 100755 --- a/src/dede/templets/article_keywords_make.htm +++ b/src/dede/templets/article_keywords_make.htm @@ -14,7 +14,7 @@ 关键字维护： - + @@ -26,9 +26,9 @@ - 检测已有的关键字 + 检测已有的关键字   - 自动获取关键字 + 自动获取关键字 diff --git a/src/dede/templets/article_keywords_select.htm b/src/dede/templets/article_keywords_select.htm index a8b4d0d1..ea5b6a93 100755 --- a/src/dede/templets/article_keywords_select.htm +++ b/src/dede/templets/article_keywords_select.htm @@ -72,8 +72,8 @@ function AddNewKw() 选择关键字 - - + + @@ -91,7 +91,7 @@ function AddNewKw() 已选的关键字： - + diff --git a/src/dede/templets/article_test_same.htm b/src/dede/templets/article_test_same.htm index eb3701f2..700d06cc 100755 --- a/src/dede/templets/article_test_same.htm +++ b/src/dede/templets/article_test_same.htm @@ -67,7 +67,7 @@ - + diff --git a/src/dede/templets/baidunews.htm b/src/dede/templets/baidunews.htm index f39e965a..d382765e 100755 --- a/src/dede/templets/baidunews.htm +++ b/src/dede/templets/baidunews.htm @@ -42,7 +42,7 @@ - + diff --git a/src/dede/templets/cards_make.htm b/src/dede/templets/cards_make.htm index a42809a3..7b52139e 100755 --- a/src/dede/templets/cards_make.htm +++ b/src/dede/templets/cards_make.htm @@ -21,9 +21,9 @@ 点卡生成向导： - + + class='btn btn-success btn-sm'>点卡使用记录 @@ -76,7 +76,7 @@ $dsql->Close(); - + diff --git a/src/dede/templets/cards_manmage.htm b/src/dede/templets/cards_manmage.htm index 45c784bc..195e53a3 100755 --- a/src/dede/templets/cards_manmage.htm +++ b/src/dede/templets/cards_manmage.htm @@ -50,17 +50,17 @@ 点卡业务管理： + class="btn btn-success btn-sm">未使用 + class="btn btn-success btn-sm">已售出 - + class="btn btn-success btn-sm">已使用 + - + + class="btn btn-success btn-sm">点卡产品分类 @@ -91,8 +91,8 @@   - - + + 　　　　 diff --git a/src/dede/templets/cards_type.htm b/src/dede/templets/cards_type.htm index ff78cb1e..0899cacf 100755 --- a/src/dede/templets/cards_type.htm +++ b/src/dede/templets/cards_type.htm @@ -78,7 +78,7 @@ - + diff --git a/src/dede/templets/catalog_add.htm b/src/dede/templets/catalog_add.htm index a2ae2b81..4f1a9fa2 100755 --- a/src/dede/templets/catalog_add.htm +++ b/src/dede/templets/catalog_add.htm @@ -482,7 +482,7 @@ $i = 0; 封面模板： - 帮助 @@ -492,7 +492,7 @@ $i = 0; 列表模板： - @@ -500,7 +500,7 @@ $i = 0; 文章模板： - @@ -575,9 +575,9 @@ $i = 0; - +     - 返回 + 返回 diff --git a/src/dede/templets/catalog_add_quick.htm b/src/dede/templets/catalog_add_quick.htm index 864debf5..ac039687 100755 --- a/src/dede/templets/catalog_add_quick.htm +++ b/src/dede/templets/catalog_add_quick.htm @@ -237,7 +237,7 @@ 排序 顶级栏目名称 子栏目(用"目录名称1,目录名称2..."这样表示多个栏目) - + @@ -247,7 +247,7 @@ - + @@ -259,7 +259,7 @@ id="toptype" class="pubinputs" style="width:160px;" /> - + @@ -272,7 +272,7 @@ 排序 栏目名称 - + @@ -281,7 +281,7 @@ - + @@ -291,7 +291,7 @@ value="" class="pubinputs" style="width:50px;" /> - + @@ -303,8 +303,8 @@ style="border:1px solid #cfcfcf;border-top:none;" class="mb-3"> - -     返回 + +     返回 diff --git a/src/dede/templets/catalog_edit.htm b/src/dede/templets/catalog_edit.htm index eb6e7210..558c7869 100755 --- a/src/dede/templets/catalog_edit.htm +++ b/src/dede/templets/catalog_edit.htm @@ -407,7 +407,7 @@ $i = 0; 封面模板： - 帮助 @@ -417,7 +417,7 @@ $i = 0; 列表模板： - @@ -425,7 +425,7 @@ $i = 0; 文章模板： - @@ -506,9 +506,9 @@ $i = 0; - +     - 返回 + 返回 diff --git a/src/dede/templets/catalog_main.htm b/src/dede/templets/catalog_main.htm index d964c609..8f88cd68 100755 --- a/src/dede/templets/catalog_main.htm +++ b/src/dede/templets/catalog_main.htm @@ -134,10 +134,10 @@ td, th{ 网站栏目管理
- 增加顶级栏目 - 批量增加栏目 - 更新栏目缓存 - 更新栏目HTML + 增加顶级栏目 + 批量增加栏目 + 更新栏目缓存 + 更新栏目HTML @@ -175,10 +175,10 @@ $tu->ListAllType($userChannel,$opendir);
- - - - + + + +
diff --git a/src/dede/templets/catalog_menu2.htm b/src/dede/templets/catalog_menu2.htm index 8ccca236..b81a38c6 100755 --- a/src/dede/templets/catalog_menu2.htm +++ b/src/dede/templets/catalog_menu2.htm @@ -176,12 +176,12 @@ body
- - + +
- - - + + + diff --git a/src/dede/templets/content_att.htm b/src/dede/templets/content_att.htm index 77757b10..75cba4eb 100755 --- a/src/dede/templets/content_att.htm +++ b/src/dede/templets/content_att.htm @@ -62,7 +62,7 @@ - + diff --git a/src/dede/templets/content_batch_up.htm b/src/dede/templets/content_batch_up.htm index 0c5192b2..0247bc48 100755 --- a/src/dede/templets/content_batch_up.htm +++ b/src/dede/templets/content_batch_up.htm @@ -151,7 +151,7 @@ + class="btn btn-success">开始操作 @@ -205,7 +205,7 @@ + class="btn btn-success">开始操作 diff --git a/src/dede/templets/content_i_list.htm b/src/dede/templets/content_i_list.htm index 5d4e5c93..72cbee9c 100755 --- a/src/dede/templets/content_i_list.htm +++ b/src/dede/templets/content_i_list.htm @@ -23,23 +23,23 @@ @@ -104,18 +104,18 @@ @@ -157,7 +157,7 @@
- {dede:if $adminid == $mid } - {else} - {/dede:if} {dede:global.CheckUserSend/} - - + - -
  - 全选 - 取消 -  查看  -  更改  -  更新  -  审核  -  推荐  + 全选 + 取消 +  查看  +  更改  +  更新  +  审核  +  推荐   移动  -  删除  -  增加属性  -  删除属性  + class="btn btn-success btn-sm"> 移动  +  删除  +  增加属性  +  删除属性 
- +
diff --git a/src/dede/templets/content_list.htm b/src/dede/templets/content_list.htm index 4d48b0f4..1d637b11 100755 --- a/src/dede/templets/content_list.htm +++ b/src/dede/templets/content_list.htm @@ -23,22 +23,22 @@ @@ -92,27 +92,27 @@ {/dede:datalist} @@ -161,7 +161,7 @@
- {dede:if $adminid==$mid } - {else} - {/dede:if} {dede:global.CheckUserSend/} - - + - -
{dede:field.arcrank function="GetRankName(@me)"/} {dede:field.mid function=GetMemberName(@me)/} - - - + + +
  - 全选 - 取消 -  更新  -  审核  -  推荐  - 全选 + 取消 +  更新  +  审核  +  推荐  +  移动  -  删除  -  自动关键字 \r\n"; ?> -  增加属性  -  删除属性  +  删除  +  自动关键字 \r\n"; ?> +  增加属性  +  删除属性 
- +
diff --git a/src/dede/templets/content_s_list.htm b/src/dede/templets/content_s_list.htm index 026e3e7e..da3ab242 100755 --- a/src/dede/templets/content_s_list.htm +++ b/src/dede/templets/content_s_list.htm @@ -118,10 +118,10 @@
- - + + - +
@@ -171,14 +171,14 @@   - 全选 - 取消 -  查看  -  更改  -  更新  -  审核  -  推荐  -  删除  + 全选 + 取消 +  查看  +  更改  +  更新  +  审核  +  推荐  +  删除  @@ -207,7 +207,7 @@ - + diff --git a/src/dede/templets/content_select_list.htm b/src/dede/templets/content_select_list.htm index 66e13e38..80169a06 100755 --- a/src/dede/templets/content_select_list.htm +++ b/src/dede/templets/content_select_list.htm @@ -88,11 +88,11 @@   - 全选 + 全选   - 取消 + 取消   - 把选定值加到列表 + 把选定值加到列表 @@ -123,7 +123,7 @@ - + diff --git a/src/dede/templets/content_sg_list.htm b/src/dede/templets/content_sg_list.htm index 97c569b0..ac06393d 100755 --- a/src/dede/templets/content_sg_list.htm +++ b/src/dede/templets/content_sg_list.htm @@ -164,24 +164,24 @@ {/dede:datalist}
- {dede:if $adminid==$mid } - {else} - {/dede:if} - - - @@ -235,27 +235,27 @@ {dede:field.click/} {dede:field.mid function=GetMemberName(@me)/} - - + +
  - 全选 - 取消 -  更新  -  审核  -  推荐  - 全选 + 取消 +  更新  +  审核  +  推荐  +  移动  -  删除  +  删除  - 把选定值加到列表 + 把选定值加到列表 @@ -296,7 +296,7 @@ style='width:150'> - +
diff --git a/src/dede/templets/diy_add.htm b/src/dede/templets/diy_add.htm index 56246f2f..01116637 100755 --- a/src/dede/templets/diy_add.htm +++ b/src/dede/templets/diy_add.htm @@ -115,10 +115,10 @@   - + - diff --git a/src/dede/templets/diy_edit.htm b/src/dede/templets/diy_edit.htm index 5d35316f..797dfef8 100755 --- a/src/dede/templets/diy_edit.htm +++ b/src/dede/templets/diy_edit.htm @@ -94,7 +94,7 @@ 您只需要增加其它个性化字段即可。 @@ -148,9 +148,9 @@ foreach($dtp->CTags as $ctag) ?> - 修改 + 修改 删除 + href="diy_field_edit.php?diyid=&action=delete&fname=GetTagName()?>" class="btn btn-success btn-sm"> 删除 CTags as $ctag)   - + - diff --git a/src/dede/templets/diy_edit_content.htm b/src/dede/templets/diy_edit_content.htm index d6f13c21..2cde79e8 100755 --- a/src/dede/templets/diy_edit_content.htm +++ b/src/dede/templets/diy_edit_content.htm @@ -58,8 +58,8 @@ body { - - + + diff --git a/src/dede/templets/diy_field_add.htm b/src/dede/templets/diy_field_add.htm index 476a887e..fb9e366e 100755 --- a/src/dede/templets/diy_field_add.htm +++ b/src/dede/templets/diy_field_add.htm @@ -85,7 +85,7 @@ td{ padding:2px; padding-left:6px; line-height:150%; }  自定义表单管理 >> 增加新字段： - + @@ -187,10 +187,10 @@ td{ padding:2px; padding-left:6px; line-height:150%; }   - + - + diff --git a/src/dede/templets/diy_field_edit.htm b/src/dede/templets/diy_field_edit.htm index 813a08f8..38c31a30 100755 --- a/src/dede/templets/diy_field_edit.htm +++ b/src/dede/templets/diy_field_edit.htm @@ -69,7 +69,7 @@ td{ padding:2px; padding-left:6px; } 自定义表单管理 >> 修改字段： - + @@ -166,10 +166,10 @@ td{ padding:2px; padding-left:6px; }   - + - + diff --git a/src/dede/templets/diy_list.htm b/src/dede/templets/diy_list.htm index 99b468d8..c6c66865 100755 --- a/src/dede/templets/diy_list.htm +++ b/src/dede/templets/diy_list.htm @@ -67,7 +67,7 @@ if(!empty($fields))    - + diff --git a/src/dede/templets/diy_main.htm b/src/dede/templets/diy_main.htm index 8f26fb83..0fef850e 100755 --- a/src/dede/templets/diy_main.htm +++ b/src/dede/templets/diy_main.htm @@ -23,7 +23,7 @@ - + @@ -47,9 +47,9 @@ {/dede:datalist} diff --git a/src/dede/templets/erradd.htm b/src/dede/templets/erradd.htm index c2fdbab1..2a1d14fe 100755 --- a/src/dede/templets/erradd.htm +++ b/src/dede/templets/erradd.htm @@ -89,9 +89,9 @@ {/dede:datalist} diff --git a/src/dede/templets/feedback_edit.htm b/src/dede/templets/feedback_edit.htm index 245ff15a..c07094ce 100755 --- a/src/dede/templets/feedback_edit.htm +++ b/src/dede/templets/feedback_edit.htm @@ -73,9 +73,9 @@
增加新的自定义表单增加新的自定义表单
{dede:field.name/} {dede:field.table/} - 更改 - 删除 - 前台预览 + 更改 + 删除 + 前台预览
- 全选 - 取消 -  删除  + 全选 + 取消 +  删除 
- +   - +
diff --git a/src/dede/templets/feedback_main.htm b/src/dede/templets/feedback_main.htm index ac37d622..cae7e169 100755 --- a/src/dede/templets/feedback_main.htm +++ b/src/dede/templets/feedback_main.htm @@ -84,7 +84,7 @@ {dede:global.openarray /} - +
@@ -123,10 +123,10 @@ 时间：{dede:field.dtime function="GetDateTimeMK(@me)" /} - 编辑 - 更新文档 @@ -157,19 +157,19 @@ + class="btn btn-success btn-sm">全选 + class="btn btn-success btn-sm">取消 + class="btn btn-success btn-sm">反选 + class="btn btn-success btn-sm">删除相同IP的所有评论 + class="btn btn-success btn-sm">删除评论 + class="btn btn-success btn-sm">审核评论 diff --git a/src/dede/templets/file_edit.htm b/src/dede/templets/file_edit.htm index 11d94dfb..7952c7fc 100755 --- a/src/dede/templets/file_edit.htm +++ b/src/dede/templets/file_edit.htm @@ -73,11 +73,11 @@ - +   - +   - diff --git a/src/dede/templets/file_manage_main.htm b/src/dede/templets/file_manage_main.htm index dc897431..daf1c289 100755 --- a/src/dede/templets/file_manage_main.htm +++ b/src/dede/templets/file_manage_main.htm @@ -80,8 +80,8 @@ while(($file = $dh->read()) !== false) 　 　 - 改名 - 删除 + 改名 + 删除 "; @@ -95,9 +95,9 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 改名 - 删除 - 移动 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -110,9 +110,9 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 改名 - 删除 - 移动 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -125,9 +125,9 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 改名 - 删除 - 移动 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -140,9 +140,9 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 改名 - 删除 - 移动 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -155,9 +155,9 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 改名 - 删除 - 移动 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -170,9 +170,9 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 改名 - 删除 - 移动 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -185,9 +185,9 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 改名 - 删除 - 移动 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -200,9 +200,9 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 改名 - 删除 - 移动 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -216,10 +216,10 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 编辑 - 改名 - 删除 - 移动 + 编辑 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -233,10 +233,10 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 编辑 - 改名 - 删除 - 移动 + 编辑 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -250,10 +250,10 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 编辑 - 改名 - 删除 - 移动 + 编辑 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -267,10 +267,10 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 编辑 - 改名 - 删除 - 移动 + 编辑 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -284,10 +284,10 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 编辑 - 改名 - 删除 - 移动 + 编辑 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -299,9 +299,9 @@ while(($file = $dh->read()) !== false) $filesize KB $filetime - 改名 - 删除 - 移动 + 改名 + 删除 + 移动 "; $files[] = $line; @@ -319,11 +319,11 @@ foreach ($files as $file) ?> - 根目录 - 新建文件 - 新建目录 - 文件上传 - 空间检查 + 根目录 + 新建文件 + 新建目录 + 文件上传 + 空间检查    diff --git a/src/dede/templets/freelist_add.htm b/src/dede/templets/freelist_add.htm index a7cb5a74..6a90b8e6 100755 --- a/src/dede/templets/freelist_add.htm +++ b/src/dede/templets/freelist_add.htm @@ -132,7 +132,7 @@ + onClick="SelectTemplets('form1.templet');" class="btn btn-success btn-sm">浏览... 最大列出页数： @@ -296,7 +296,7 @@   + class="btn btn-success">保存一个列表 diff --git a/src/dede/templets/freelist_edit.htm b/src/dede/templets/freelist_edit.htm index 4e4f49f1..c0da9b81 100755 --- a/src/dede/templets/freelist_edit.htm +++ b/src/dede/templets/freelist_edit.htm @@ -122,7 +122,7 @@ + onClick="SelectTemplets('form1.templet');" class="btn btn-success btn-sm">浏览... 最大列出页数： @@ -304,7 +304,7 @@   + class="btn btn-success">保存一个列表 diff --git a/src/dede/templets/freelist_main.htm b/src/dede/templets/freelist_main.htm index 204d75e9..a78dc078 100755 --- a/src/dede/templets/freelist_main.htm +++ b/src/dede/templets/freelist_main.htm @@ -106,7 +106,7 @@ @@ -133,14 +133,14 @@ value="" />
自由列表管理  - 增加列表 + 增加列表     - + + onclick="location='freelist_add.php';" class="btn btn-success btn-sm">增加列表   + onclick="location='makehtml_freelist.php';" class="btn btn-success btn-sm">更新所有列表HTML diff --git a/src/dede/templets/friendlink_add.htm b/src/dede/templets/friendlink_add.htm index e077e937..1e22e227 100755 --- a/src/dede/templets/friendlink_add.htm +++ b/src/dede/templets/friendlink_add.htm @@ -105,8 +105,8 @@ function CheckSubmit()
  - - + +
diff --git a/src/dede/templets/friendlink_edit.htm b/src/dede/templets/friendlink_edit.htm index 875bd56c..0ba7e4e7 100755 --- a/src/dede/templets/friendlink_edit.htm +++ b/src/dede/templets/friendlink_edit.htm @@ -93,9 +93,9 @@   - 　 + 　 + class="btn btn-success"> 返 回 diff --git a/src/dede/templets/friendlink_main.htm b/src/dede/templets/friendlink_main.htm index fc9fd130..2c724f0c 100755 --- a/src/dede/templets/friendlink_main.htm +++ b/src/dede/templets/friendlink_main.htm @@ -47,9 +47,9 @@ 友情链接管理 @@ -73,7 +73,7 @@ - + @@ -104,8 +104,8 @@ {dede:field.ischeck function="GetSta(@me)"/} {dede:field.sortrank/} - 更改 - 删除 + 更改 + 删除 {/dede:datalist} @@ -113,9 +113,9 @@ 　 - 全选 - 取消 - 批量删除 + 全选 + 取消 + 批量删除 diff --git a/src/dede/templets/friendlink_type.htm b/src/dede/templets/friendlink_type.htm index 7dc36a4a..60cf06b6 100755 --- a/src/dede/templets/friendlink_type.htm +++ b/src/dede/templets/friendlink_type.htm @@ -17,9 +17,9 @@ 友情链接管理  - 增加链接 - 网站类型管理 - 外部申请表单 + 增加链接 + 网站类型管理 + 外部申请表单 类型ID diff --git a/src/dede/templets/index2.htm b/src/dede/templets/index2.htm index 3c4326f8..f46e0934 100755 --- a/src/dede/templets/index2.htm +++ b/src/dede/templets/index2.htm @@ -112,24 +112,7 @@
-
    -
  • - >织梦绿 -
- -
  • - >淡蓝 -
    • - -
  • - >咖啡 - -
    • -
  • - >水墨 - -
    • - + diff --git a/src/dede/templets/index_body.htm b/src/dede/templets/index_body.htm index 0dd85edd..8d81e0c8 100755 --- a/src/dede/templets/index_body.htm +++ b/src/dede/templets/index_body.htm @@ -71,7 +71,7 @@ \r\n"; + echo "安全操作：数据库备份/还原 病毒扫描 系统错误修复\r\n"; echo ""; ?> @@ -145,7 +145,7 @@ echo "信息采集员或其它管理员"; } ?> - 查看更多 + 查看更多 diff --git a/src/dede/templets/log_list.htm b/src/dede/templets/log_list.htm index 4a46be86..78433508 100755 --- a/src/dede/templets/log_list.htm +++ b/src/dede/templets/log_list.htm @@ -82,7 +82,7 @@   - + @@ -128,9 +128,9 @@ -   -   -   +   +   +   diff --git a/src/dede/templets/makehtml_all.htm b/src/dede/templets/makehtml_all.htm index bf70f0f0..43b420e7 100755 --- a/src/dede/templets/makehtml_all.htm +++ b/src/dede/templets/makehtml_all.htm @@ -72,11 +72,11 @@ function SelUp(){   更新选项： -