From 913a09e01962a9539f8353ae74e4049c246e40da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Thu, 27 Apr 2023 11:11:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/css/login.min.css | 2 +- src/admin/inc/inc_menu.php | 1 + src/admin/makehtml_all.php | 6 +-- src/admin/makehtml_freelist_action.php | 8 ++-- src/admin/makehtml_list_action.php | 8 ++-- src/admin/makehtml_taglist_action.php | 8 ++-- src/admin/sys_cache_up.php | 8 ++-- src/admin/task_do.php | 4 +- src/admin/templets/album_add.htm | 2 +- src/admin/templets/member_pmall.htm | 52 ++++++++++------------ src/admin/templets/member_pmone.htm | 60 ++++++++++++-------------- src/admin/templets/sys_info.htm | 16 ++++--- src/admin/templets/sys_info_mark.htm | 2 +- src/install/install.html | 2 +- src/static/ckeditor/contents.css | 2 +- src/static/web/css/admin.css | 18 +++++++- src/static/web/css/style.css | 15 ++++++- src/user/api.php | 3 -- src/user/templets/album_edit.htm | 2 +- src/user/templets/edit_baseinfo.htm | 16 ++++--- 20 files changed, 126 insertions(+), 109 deletions(-) diff --git a/src/admin/css/login.min.css b/src/admin/css/login.min.css index b1017cdb..10e0f70a 100644 --- a/src/admin/css/login.min.css +++ b/src/admin/css/login.min.css @@ -1 +1 @@ -body{line-height:1.6;letter-spacing:.6px;font:14px 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}.mb-6{margin-bottom:6.5rem!important}.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:0 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:20px 30px;font-size:14px;line-height:16px;color:#856404;background:#fff3cd;border-radius:.35rem;border:0}.browsehappy-close{float:right;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 +body{line-height:1.6;letter-spacing:.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}.mb-6{margin-bottom:6.5rem!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:0 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:20px 30px;font-size:14px;line-height:16px;color:#856404;background:#fff3cd;border-radius:.35rem;border:0}.browsehappy-close{float:right;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/inc/inc_menu.php b/src/admin/inc/inc_menu.php index a8c443ff..caca62a4 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -106,6 +106,7 @@ $adminMenu1 + diff --git a/src/admin/makehtml_all.php b/src/admin/makehtml_all.php index acb0b9e1..9dc50820 100644 --- a/src/admin/makehtml_all.php +++ b/src/admin/makehtml_all.php @@ -46,7 +46,7 @@ if ($action == '') { } else { if (file_exists($homeFile)) echo "启用静态更新，建议删除"+$homeFile; } - ShowMsg("完成所有文档更新，开始更新栏目", "makehtml_all.php?action=make&step=4&uptype=$uptype&mkvalue=$mkvalue"); + ShowMsg("完成所有文档更新，开始更新所有栏目", "makehtml_all.php?action=make&step=4&uptype=$uptype&mkvalue=$mkvalue"); exit(); } //更新栏目 @@ -94,11 +94,11 @@ if ($action == '') { } fwrite($fp, "?".">"); fclose($fp); - ShowMsg("完成栏目缓存处理，开始更新栏目", "makehtml_list_action.php?gotype=mkall"); + ShowMsg("完成栏目缓存处理，开始更新所有栏目", "makehtml_list_action.php?gotype=mkall"); exit(); } else { fclose($fp); - ShowMsg("没有可更新的栏目，最后数据优化", "makehtml_all.php?action=make&step=10"); + ShowMsg("没有可更新的栏目，数据已优化", "makehtml_all.php?action=make&step=10"); exit(); } } diff --git a/src/admin/makehtml_freelist_action.php b/src/admin/makehtml_freelist_action.php index 83e90990..9f4ccb27 100644 --- a/src/admin/makehtml_freelist_action.php +++ b/src/admin/makehtml_freelist_action.php @@ -28,7 +28,7 @@ $totalpage = count($idArray); if (isset($idArray[$pageno])) { $lid = $idArray[$pageno]; } else { - ShowMsg("完成所有文件更新", 'javascript:;'); + ShowMsg("完成所有列表更新", 'javascript:;'); exit(); } $lv = new FreeList($lid); @@ -50,14 +50,14 @@ if ($ntotalpage <= $maxpagesize) { $lv->Close(); $nextpage = $pageno + 1; if ($nextpage == $totalpage) { - ShowMsg("完成所有文件更新", 'javascript:;'); + ShowMsg("完成所有列表更新", 'javascript:;'); } else { if ($finishType) { $gourl = "makehtml_freelist_action.php?maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$nextpage"; - ShowMsg("更新列表".$tid."，继续执行任务", $gourl, 0, 100); + ShowMsg("更新列表".$tid."，继续更新列表", $gourl, 0, 100); } else { $gourl = "makehtml_freelist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$pageno"; - ShowMsg("更新列表".$tid."，继续执行任务", $gourl, 0, 100); + ShowMsg("更新列表".$tid."，继续更新列表", $gourl, 0, 100); } } $dsql->ExecuteNoneQuery("UPDATE `#@__freelist` SET nodefault='1' where aid='$startid';"); diff --git a/src/admin/makehtml_list_action.php b/src/admin/makehtml_list_action.php index 399124e0..c38ed535 100644 --- a/src/admin/makehtml_list_action.php +++ b/src/admin/makehtml_list_action.php @@ -55,7 +55,7 @@ if (isset($idArray[$pageno])) { ShowMsg("完成所有栏目更新", "javascript:;"); exit(); } else if ($gotype == 'mkall' || $gotype == 'mkallct') { - ShowMsg("完成所有栏目更新，最后数据优化", "makehtml_all.php?action=make&step=10"); + ShowMsg("完成所有栏目更新，数据已优化", "makehtml_all.php?action=make&step=10"); exit(); } } @@ -102,18 +102,18 @@ if ($nextpage >= $totalpage && $finishType) { ShowMsg("完成所有栏目更新，浏览栏目", "javascript:;"); exit(); } else if ($gotype == 'mkall' || $gotype == 'mkallct') { - ShowMsg("完成所有栏目更新，最后数据优化", "makehtml_all.php?action=make&step=10"); + ShowMsg("完成所有栏目更新，数据已优化", "makehtml_all.php?action=make&step=10"); exit(); } } else { $typename = isset($cfg_Cs[$tid][3])? base64_decode($cfg_Cs[$tid][3]) : ""; if ($finishType) { $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$nextpage"; - ShowMsg("更新栏目（id：".$tid."）{$typename}，继续执行任务", $gourl, 0, 100); + ShowMsg("更新栏目（id：".$tid."）{$typename}，继续更新栏目", $gourl, 0, 100); exit(); } else { $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&mkpage=$mkpage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$pageno"; - ShowMsg("更新栏目（id：".$tid."）{$typename}，继续执行任务", $gourl, 0, 100); + ShowMsg("更新栏目（id：".$tid."）{$typename}，继续更新栏目", $gourl, 0, 100); exit(); } } diff --git a/src/admin/makehtml_taglist_action.php b/src/admin/makehtml_taglist_action.php index a612eeed..8926c862 100644 --- a/src/admin/makehtml_taglist_action.php +++ b/src/admin/makehtml_taglist_action.php @@ -45,7 +45,7 @@ if ($ctagid == 0 && $allfinish) { $dlist->SetTagsDir($tagsdir); $dlist->MakeHtml(1, 10); $reurl = '..'.$tagsdir; - ShowMsg("更新标签，浏览标签", "javascript:;"); + ShowMsg("完成所有标签更新，浏览标签", "javascript:;"); exit; } $tag = $dsql->GetOne("SELECT * FROM `#@__tagindex` WHERE id='$ctagid' LIMIT 0,1;"); @@ -75,7 +75,7 @@ if (is_array($tag) && count($tag) > 0) { $dlist->MakeHtml(1, 10); $reurl = '..'.$tagsdir; if ($upall == 1) { - ShowMsg("完成所有标签更新，浏览标签页", "javascript:;"); + ShowMsg("完成所有标签更新，浏览标签", "javascript:;"); } else { $query = "UPDATE `#@__tagindex` SET mktime=uptime WHERE id='$ctagid' "; $dsql->ExecuteNoneQuery($query); @@ -93,12 +93,12 @@ if (is_array($tag) && count($tag) > 0) { $nextpage = 0; } $gourl = "makehtml_taglist_action.php?maxpagesize=$maxpagesize&tagid=$tagid&pageno=$nextpage&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime"; - ShowMsg("更新标签".$tag['tag']."，继续执行任务", $gourl, 0, 100); + ShowMsg("更新标签".$tag['tag']."，继续更新标签", $gourl, 0, 100); exit(); } else { //继续当前这个 $gourl = "makehtml_taglist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&tagid=$tagid&pageno=$pageno&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime"; - ShowMsg("更新标签".$tag['tag']."，继续执行任务", $gourl, 0, 100); + ShowMsg("更新标签".$tag['tag']."，继续更新标签", $gourl, 0, 100); exit(); } } diff --git a/src/admin/sys_cache_up.php b/src/admin/sys_cache_up.php index bbdf6ef8..42415b88 100644 --- a/src/admin/sys_cache_up.php +++ b/src/admin/sys_cache_up.php @@ -23,7 +23,7 @@ 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(); } //更新枚举缓存 @@ -31,7 +31,7 @@ if ($dopost == "ok") { include_once(DEDEINC."/enums.func.php"); WriteEnumsCache(); //WriteAreaCache(); 已过期 - ShowMsg("正在清理枚举缓存，下一步清理调用缓存", "sys_cache_up.php?dopost=ok&step=3&uparc=$uparc"); + ShowMsg("正在清理枚举缓存，继续清理调用缓存", "sys_cache_up.php?dopost=ok&step=3&uparc=$uparc"); exit(); } //清理arclist调用缓存、过期会员浏览历史、过期短信、陈旧的流量统计数据 @@ -39,10 +39,10 @@ if ($dopost == "ok") { 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天之前流量统计"; diff --git a/src/admin/task_do.php b/src/admin/task_do.php index 08d97637..a429c8ee 100644 --- a/src/admin/task_do.php +++ b/src/admin/task_do.php @@ -61,7 +61,7 @@ if ($dopost == 'makeprenext') { exit(); } else { $jumpurl = GetNextUrl(); - ShowMsg("完成下篇文档更新任务，继续执行其它任务", $jumpurl, 0, 500); + ShowMsg("完成下篇文档更新任务，继续更新其它任务", $jumpurl, 0, 500); 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, 0, 500); exit(); } else { ShowMsg("完成栏目：{$tid}更新，完成所有更新任务", "close::tgtable"); diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index 29bd7040..399ab014 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -27,7 +27,7 @@ - + diff --git a/src/admin/templets/member_pmall.htm b/src/admin/templets/member_pmall.htm index 3e14dd45..30dc41ee 100644 --- a/src/admin/templets/member_pmall.htm +++ b/src/admin/templets/member_pmall.htm @@ -24,34 +24,28 @@
- - - - - - - -
- 短信列表 - 群发短信 - 单独短信 -
-
- - - - - - - - - - - - - -
标题：（标题少于70个字符内）
（1000个字符以内）
-
-
+
+ + + + + + + + + + + + + + + + +
+ 短信列表 + 群发短信 + 单独短信 +
标题：（标题少于70个字符内）
（1000个字符以内）
+
\ No newline at end of file diff --git a/src/admin/templets/member_pmone.htm b/src/admin/templets/member_pmone.htm index c79859e2..ded05b37 100644 --- a/src/admin/templets/member_pmone.htm +++ b/src/admin/templets/member_pmone.htm @@ -24,38 +24,32 @@ - - - - - - - -
- 短信列表 - 群发短信 - 单独短信 -
-
- - - - - - - - - - - - - - - - - -
发送到： 填写会员登录的id（网址uid=后面跟着的id）
标题：（标题少于70个字符内）
（1000个字符以内）
-
-
+
+ + + + + + + + + + + + + + + + + + + + +
+ 短信列表 + 群发短信 + 单独短信 +
发送到： 填写会员登录的id（网址uid=后面跟着的id）
标题：（标题少于70个字符内）
（1000个字符以内）
+
\ No newline at end of file diff --git a/src/admin/templets/sys_info.htm b/src/admin/templets/sys_info.htm index d16dda26..fd65cbc1 100644 --- a/src/admin/templets/sys_info.htm +++ b/src/admin/templets/sys_info.htm @@ -35,7 +35,7 @@ - +
@@ -144,15 +144,17 @@ - - - - - - + + + + +
+ + +
- +
diff --git a/src/static/ckeditor/contents.css b/src/static/ckeditor/contents.css index e4587ab2..13de3fa2 100644 --- a/src/static/ckeditor/contents.css +++ b/src/static/ckeditor/contents.css @@ -1,8 +1,8 @@ body { line-height:1.6; letter-spacing:.6px; - font-family:sans-serif,Arial,Verdana,"Trebuchet MS","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"; font-size:14px; + font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif; color:#545b62; background-color:#fff } diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 4be92d30..d985ab17 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -10,14 +10,28 @@ background:#dee2e6; border-radius:.5rem } +::-moz-scrollbar { + width:6px; + height:6px +} +::-moz-scrollbar-track { + background:#f5f5f5; + border-radius:.5rem +} +::-moz-scrollbar-thumb { + background:#dee2e6; + border-radius:.5rem +} * { - font-size:12px + font-size:12px; + font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif } body { margin:0; line-height:1.6; letter-spacing:.6px; - font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif; + font-size:12px; + font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif; color:#545b62; background:#fff } diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 1b75ef41..53b660c0 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -10,10 +10,23 @@ background:#dee2e6; border-radius:.5rem } +::-moz-scrollbar { + width:6px; + height:6px +} +::-moz-scrollbar-track { + background:#f5f5f5; + border-radius:.5rem +} +::-moz-scrollbar-thumb { + background:#dee2e6; + border-radius:.5rem +} body { line-height:1.6; letter-spacing:.6px; - font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif; + font-size:14px; + font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif; color:#545b62 } a { diff --git a/src/user/api.php b/src/user/api.php index 96efb628..93b40ebb 100755 --- a/src/user/api.php +++ b/src/user/api.php @@ -98,10 +98,8 @@ if ($action === 'is_need_check_code') { )); exit; } - $uploadedFile = $_FILES['file']['tmp_name']; $fileType = mime_content_type($uploadedFile); - if (!in_array($fileType, $allowedTypes)) { echo json_encode(array( "code" => -1, @@ -127,7 +125,6 @@ if ($action === 'is_need_check_code') { $width = $imgSize[0]; $height = $imgSize[1]; } - if (!is_dir($cfg_basedir.$cfg_user_dir."/{$cfg_ml->M_ID}")) { MkdirAll($cfg_basedir.$cfg_user_dir."/{$cfg_ml->M_ID}", $cfg_dir_purview); CloseFtp(); diff --git a/src/user/templets/album_edit.htm b/src/user/templets/album_edit.htm index b92e5b79..12691e4e 100755 --- a/src/user/templets/album_edit.htm +++ b/src/user/templets/album_edit.htm @@ -126,9 +126,9 @@
- + \ No newline at end of file diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm index 8331200a..64450c6a 100755 --- a/src/user/templets/edit_baseinfo.htm +++ b/src/user/templets/edit_baseinfo.htm @@ -26,7 +26,7 @@
-
会员资料修改需验证原登录密码才能修改
+
会员资料修改需要验证密码才能修改
@@ -46,8 +46,8 @@
- -
+ +
@@ -102,7 +102,7 @@ function checkSubmit() { if (document.form2.oldpwd.value == '') { document.form2.oldpwd.focus(); - ShowMsg("请您填写原登录密码"); + ShowMsg("请您填写密码"); return false; } if (document.form2.userpwdok.value != document.form2.userpwd.value) { @@ -120,11 +120,13 @@ ShowMsg("请您填写昵称"); return false; } - }; + } + +