From f71b5ab1013dc6b6e881320ca07be486c321a3ea 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: Tue, 15 Nov 2022 11:58:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/inc/inc_archives_functions.php | 2 +- src/admin/login.php | 51 ++++++++----------- src/admin/templets/index.htm | 8 +-- src/admin/templets/login.htm | 11 +--- src/admin/templets/member_scores.htm | 2 +- src/admin/templets/mychannel_edit.htm | 4 +- src/admin/templets/mychannel_field_edit.htm | 2 +- src/admin/templets/mychannel_modifysearch.htm | 2 +- src/admin/templets/sys_group.htm | 2 +- src/admin/templets/templets_default.htm | 2 +- src/apps/feedback.php | 2 +- src/install/sql-dfdata.txt | 4 +- src/static/web/css/user.css | 12 +++-- src/static/web/js/member.album.js | 2 +- src/user/archives_sg_add.php | 4 +- src/user/archives_sg_edit.php | 2 +- src/user/check_card.php | 2 +- src/user/config.php | 14 ++--- src/user/inc/archives_check.php | 17 +++---- src/user/inc/archives_check_edit.php | 4 +- src/user/inc/inc_archives_functions.php | 4 +- src/user/inc/inc_catalog_options.php | 12 ++--- src/user/inc/inc_pwd_functions.php | 4 +- src/user/index.php | 5 +- src/user/index_do.php | 17 ++----- src/user/reg_new.php | 2 +- src/user/templets/album_add.htm | 11 ++-- src/user/templets/archives_add.htm | 34 ++----------- src/user/templets/archives_edit.htm | 23 --------- src/user/templets/archives_sg_add.htm | 34 ++----------- src/user/templets/archives_sg_edit.htm | 23 --------- src/user/templets/article_add.htm | 34 ++----------- src/user/templets/article_edit.htm | 23 --------- src/user/templets/content_list.htm | 2 +- src/user/templets/content_sg_list.htm | 2 +- src/user/templets/index.htm | 2 +- src/user/templets/login.htm | 6 --- src/user/templets/mystow.htm | 38 ++++++-------- src/user/templets/resetpassword.htm | 3 +- src/user/templets/resetpassword2.htm | 5 +- src/user/templets/resetpassword3.htm | 3 +- src/user/templets/soft_add.htm | 34 ++----------- src/user/templets/soft_edit.htm | 23 --------- 43 files changed, 129 insertions(+), 364 deletions(-) diff --git a/src/admin/inc/inc_archives_functions.php b/src/admin/inc/inc_archives_functions.php index c77cd9a8..810a9cae 100644 --- a/src/admin/inc/inc_archives_functions.php +++ b/src/admin/inc/inc_archives_functions.php @@ -17,7 +17,7 @@ if (!isset($_NOT_ARCHIVES)) { require_once(DEDEINC.'/customfields.func.php'); } /** - * 获得HTML里的外部资源,针对图片 + * 获得网页里的外部资源,针对图片 * * @access public * @param string $body 文档 diff --git a/src/admin/login.php b/src/admin/login.php index a0e47a76..e1931594 100644 --- a/src/admin/login.php +++ b/src/admin/login.php @@ -40,42 +40,31 @@ $admindir = $admindirs[count($admindirs) - 1]; if ($dopost == 'login') { $validate = empty($validate) ? '' : strtolower(trim($validate)); $svali = strtolower(GetCkVdValue()); - if ($validate == '' || $validate != $svali) { - ResetVdValue(); - ShowMsg('验证码不正确', 'login.php', 0, 1000); - exit; - } else { - $cuserLogin = new userLogin($admindir); - if (!empty($userid) && !empty($pwd)) { - $res = $cuserLogin->checkUser($userid, $pwd); - //success - if ($res == 1) { - $cuserLogin->keepUser(); - if (!empty($gotopage)) { - ShowMsg('成功登录,正在转向管理管理主页', $gotopage); - exit(); - } else { - ShowMsg('成功登录,正在转向管理管理主页', 'index.php'); - exit(); - } - } - //error - else if ($res == -1) { - ResetVdValue(); - ShowMsg('您的用户名不存在', 'login.php', 0, 1000); - exit; + $cuserLogin = new userLogin($admindir); + if (!empty($userid) && !empty($pwd)) { + $res = $cuserLogin->checkUser($userid, $pwd); + if ($res == 1) { + $cuserLogin->keepUser(); + if (!empty($gotopage)) { + ShowMsg('成功登录,正在转向管理管理主页', $gotopage); + exit(); } else { - ResetVdValue(); - ShowMsg('您的密码错误', 'login.php', 0, 1000); - exit; + ShowMsg('成功登录,正在转向管理管理主页', 'index.php'); + exit(); } - } - //password empty - else { + } else if ($res == -1) { ResetVdValue(); - ShowMsg('用户和密码没填写完整', 'login.php', 0, 1000); + ShowMsg('您的账号不存在', 'login.php', 0, 1000); + exit; + } else { + ResetVdValue(); + ShowMsg('您的密码错误', 'login.php', 0, 1000); exit; } + } else { + ResetVdValue(); + ShowMsg('用户和密码没填写完整', 'login.php', 0, 1000); + exit; } } include('templets/login.htm'); diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm index 0118a728..1793d68f 100644 --- a/src/admin/templets/index.htm +++ b/src/admin/templets/index.htm @@ -12,7 +12,7 @@
- +
您目前所展开的是系统模型,系统模型一般对发布程序和管理程序已经固化,如果您胡乱修改系统模型将会导致使用这种文档类型的栏目可能崩溃
@@ -256,7 +256,7 @@
if ($ft==1) {
?>
-
+
|
|||
您当前操作的字段属于系统模型字段:修改系统模型有风险,请不要随便改动系统模型的字段相关的属性
diff --git a/src/admin/templets/mychannel_modifysearch.htm b/src/admin/templets/mychannel_modifysearch.htm
index a99fd5d5..6b40c2e0 100644
--- a/src/admin/templets/mychannel_modifysearch.htm
+++ b/src/admin/templets/mychannel_modifysearch.htm
@@ -29,7 +29,7 @@
| 栏目名称: | ||
主表可供自定义搜索的字段:标题、关键词、摘要为默认选项,不用选择 | diff --git a/src/admin/templets/sys_group.htm b/src/admin/templets/sys_group.htm index 66be7a19..1308e88a 100644 --- a/src/admin/templets/sys_group.htm +++ b/src/admin/templets/sys_group.htm @@ -42,7 +42,7 @@ | 权限设定 组用户 - system==0){?>删除组 + system==0) {?>删除组 | 修改 - + 删除 | diff --git a/src/apps/feedback.php b/src/apps/feedback.php index d6c46e85..64aa8b30 100755 --- a/src/apps/feedback.php +++ b/src/apps/feedback.php @@ -106,7 +106,7 @@ else if ($action == 'send') { //ResetVdValue(); echo json_encode(array( "code" => -1, - "msg" => "验证码错误", + "msg" => "验证码不正确", "data" => null, )); exit(); diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index d1e743be..a7948264 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -3977,7 +3977,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('40','cfg_ftp_root','网站根在FTP中的目录','2','string','/'), ('41','cfg_ftp_mkdir','是否强制用FTP创建目录','2','bool','N'), ('42','cfg_list_son','是否包含上级列表子类文档','6','bool','Y'), -('43','cfg_mb_open','是否开启会员功能','4','bool','N'), +('43','cfg_mb_open','是否开启用户功能','4','bool','N'), ('44','cfg_mb_album','是否开启会员图集功能','4','bool','Y'), ('45','cfg_mb_upload','是否允许会员上传非图片附件','4','bool','Y'), ('46','cfg_mb_upload_size','会员上传文件大小:KB','4','number','1024'), @@ -4049,7 +4049,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('113','cfg_feedback_forbid','是否禁止所有评论,包括禁止顶踩等','5','bool','N'), ('114','cfg_addon_domainbind','是否绑定附件目录为指定的二级域名','7','bool','N'), ('115','cfg_addon_domain','附件目录的二级域名','7','string',''), -('116','cfg_df_dutyadmin','默认责任修改名称','7','string','网站管理员'), +('116','cfg_df_dutyadmin','默认作者名称','7','string','网站管理员'), ('117','cfg_mb_allowncarc','是否允许用户空间显示未审核文档','4','bool','Y'), ('118','cfg_mb_spaceallarc','会员空间中所有文档的栏目ID(不限为0)','4','number','0'), ('119','cfg_face_adds','上传头像增加积分','5','number','10'), diff --git a/src/static/web/css/user.css b/src/static/web/css/user.css index 764c5aa1..4d0ded6d 100644 --- a/src/static/web/css/user.css +++ b/src/static/web/css/user.css @@ -2,6 +2,7 @@ body { background:#f5f5f5 } .login-bg { + margin:-1rem 0; padding:6rem 0; background-image:url(../img/member_bg.jpg); background-repeat:no-repeat; @@ -19,11 +20,8 @@ body { .login-area .licence a { color:#1eb867 } -.copyright.light { - background:#fff -} -.flink,.flink a,.copyright.light,.copyright.light a { - color:#545b62 +#validateimg { + border-radius:0 .2rem .2rem 0 } .member-actions { line-height:40px; @@ -74,6 +72,10 @@ body { border-radius:50%; border:1px solid #dee2e6 } +.form-control { + height:36px; + line-height:36px +} @media (max-width:480px) { .m-pb-2 { padding-bottom:2rem diff --git a/src/static/web/js/member.album.js b/src/static/web/js/member.album.js index 6b3e18c1..1c6bc5e7 100644 --- a/src/static/web/js/member.album.js +++ b/src/static/web/js/member.album.js @@ -119,7 +119,7 @@ function ShowZipField(formitem,zipid,upid) document.getElementById(zipid).style.display = 'none'; } } -//图片显示与隐藏Html修改框 +//图片显示与隐藏修改框 function ShowHtmlField(formitem,htmlid,upid) { if ($Nav()!="IE"){ diff --git a/src/user/archives_sg_add.php b/src/user/archives_sg_add.php index f52b80bd..6f4bb1d6 100755 --- a/src/user/archives_sg_add.php +++ b/src/user/archives_sg_add.php @@ -55,7 +55,7 @@ else if ($dopost == 'save') { $svali = GetCkVdValue(); if (strtolower($vdcode) != $svali || $svali == '') { ResetVdValue(); - ShowMsg('验证码错误', '-1'); + ShowMsg('验证码不正确', '-1'); exit(); } } @@ -65,7 +65,7 @@ else if ($dopost == 'save') { $autokey = $remote = $dellink = $autolitpic = 0; $userip = GetIP(); if ($typeid == 0) { - ShowMsg('请指定文档所属栏目', '-1'); + ShowMsg('您还没选择栏目,请选择发布文档栏目', '-1'); exit(); } $query = "SELECT tp.ispart,tp.channeltype,tp.issend,ch.issend AS cissend,ch.sendrank,ch.arcsta,ch.addtable,ch.fieldset,ch.usertype FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE tp.id='$typeid' "; diff --git a/src/user/archives_sg_edit.php b/src/user/archives_sg_edit.php index 67f5bd7f..fc1c517b 100755 --- a/src/user/archives_sg_edit.php +++ b/src/user/archives_sg_edit.php @@ -48,7 +48,7 @@ else if ($dopost == 'save') { $typeid = isset($typeid) && is_numeric($typeid) ? $typeid : 0; $userip = GetIP(); if ($typeid == 0) { - ShowMsg('请指定文档所属栏目', '-1'); + ShowMsg('您还没选择栏目,请选择发布文档栏目', '-1'); exit(); } $query = "SELECT tp.ispart,tp.channeltype,tp.issend,ch.issend AS cissend,ch.sendrank,ch.arcsta,ch.addtable,ch.fieldset,ch.usertype FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch ON ch.id=tp.channeltype WHERE tp.id='$typeid' "; diff --git a/src/user/check_card.php b/src/user/check_card.php index 734239f6..e7b6c495 100755 --- a/src/user/check_card.php +++ b/src/user/check_card.php @@ -9,7 +9,7 @@ require_once(dirname(__FILE__)."/config.php"); $svali = GetCkVdValue(); if (strtolower($vdcode) != $svali || $svali == "") { - ShowMsg("验证码错误", "-1"); + ShowMsg("验证码不正确", "-1"); exit(); } $cardid = preg_replace("#[^0-9A-Za-z-]#", "", $cardid); diff --git a/src/user/config.php b/src/user/config.php index bd0a9c01..167b6715 100755 --- a/src/user/config.php +++ b/src/user/config.php @@ -80,7 +80,7 @@ function CheckCSRF() && is_string($_POST['_csrf_token']) && is_string($cc_csrf_token_check) && hash_equals($_POST['_csrf_token'], $cc_csrf_token_check)) ) { - ShowMsg('CSRF校验失败,请刷新页面重新提交', '-1'); + ShowMsg('刷新页面重新提交,请不要发布重复文档', '-1'); exit(); } DropCookie("dede_csrf_token"); @@ -108,13 +108,13 @@ $s_scriptName = $dedeNowurls[0]; $menutype = ''; $menutype_son = ''; $gourl = empty($gourl) ? "" : RemoveXSS($gourl); -//检查是否开放会员功能 +//检查是否开放用户功能 if ($cfg_mb_open == 'N') { if (defined('AJAXLOGIN')) { if ($format === 'json') { echo json_encode(array( "code" => -1, - "msg" => "系统关闭了会员功能,因此您无法访问此页面", + "msg" => "系统关闭了用户功能,因此您无法访问此页面", "data" => null, )); exit; @@ -122,7 +122,7 @@ if ($cfg_mb_open == 'N') { die(''); } } else { - ShowMsg("系统关闭了会员功能,因此您无法访问此页面", "javascript:;"); + ShowMsg("系统关闭了用户功能,因此您无法访问此页面", "javascript:;"); exit(); } } @@ -199,10 +199,10 @@ function CheckRank($rank = 0, $money = 0) $myname = "普通会员"; } } - ShowMsg("对不起,需要:$needname 才能访问本页面