From 6108ebf2758fef5b35c4436ee3221cf055c4fbd8 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: Fri, 18 Nov 2022 11:09:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=BA=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/templets/catalog_add_quick.htm | 64 +++++++++++++----------- src/admin/templets/diy_edit.htm | 2 +- src/admin/templets/friendlink_add.htm | 2 +- src/admin/templets/friendlink_edit.htm | 2 +- src/admin/templets/member_toadmin.htm | 2 +- src/admin/templets/member_view.htm | 2 +- src/apps/recommend.php | 2 +- src/static/web/js/member.album.js | 10 +--- src/static/web/js/user.js | 2 +- src/theme/plus/flink-add.htm | 4 +- src/theme/plus/recommend.htm | 2 +- src/user/edit_baseinfo.php | 12 ++--- src/user/edit_email.php | 4 +- src/user/index_do.php | 6 +-- src/user/templets/album_add.htm | 7 +-- src/user/templets/album_edit.htm | 2 +- src/user/templets/archives_add.htm | 7 +-- src/user/templets/archives_edit.htm | 2 +- src/user/templets/archives_sg_add.htm | 7 +-- src/user/templets/archives_sg_edit.htm | 2 +- src/user/templets/article_add.htm | 7 +-- src/user/templets/article_edit.htm | 2 +- src/user/templets/edit_baseinfo.htm | 18 +++---- src/user/templets/soft_add.htm | 22 ++------ src/user/templets/soft_edit.htm | 8 ++- 25 files changed, 86 insertions(+), 114 deletions(-) diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm index 149f1165..d849d38e 100644 --- a/src/admin/templets/catalog_add_quick.htm +++ b/src/admin/templets/catalog_add_quick.htm @@ -153,17 +153,6 @@ 默认页的名称： - - 支持变量： - {Y}、{M}、{D} 年月日
- {timestamp} INT类型的UNIX时间戳
- {aid} 文档id
- {pinyin} 拼音+文档id
- {py} 拼音部首+文档id
- {typedir} 栏目目录
- {cc} 日期+ID混编后用转换为适合的字母
- - 文档命名规则： @@ -171,9 +160,20 @@ - + 支持变量： - {page} 列表的页码 + + {Y}、{M}、{D} 年月日
+ {timestamp} INT类型的UNIX时间戳
+ {aid} 文档id
+ {pinyin} 拼音+文档id
+ {py} 拼音部首+文档id
+ {typedir} 栏目目录
+ {cc} 日期+ID混编后用转换为适合的字母
+ Nginx伪静态默认规则
+ rewrite ^/([0-9]+).html$ /apps/view.php?arcID=$1;
+ rewrite ^/([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2; + 列表命名规则： @@ -182,6 +182,15 @@ + + 支持变量： + + {page} 列表的页码
+ Nginx伪静态默认规则
+ rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;
+ rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2; + + @@ -192,54 +201,51 @@ - + - - - + + + - + - - + +
子栏目（用"目录名称1,目录名称2"这样表示多个栏目）
-
- + - + - - + + - + - + diff --git a/src/admin/templets/diy_edit.htm b/src/admin/templets/diy_edit.htm index 7e02898f..31113257 100644 --- a/src/admin/templets/diy_edit.htm +++ b/src/admin/templets/diy_edit.htm @@ -98,7 +98,7 @@ diff --git a/src/admin/templets/friendlink_add.htm b/src/admin/templets/friendlink_add.htm index 861b50d3..3f3bf4c5 100644 --- a/src/admin/templets/friendlink_add.htm +++ b/src/admin/templets/friendlink_add.htm @@ -59,7 +59,7 @@ - + diff --git a/src/admin/templets/friendlink_edit.htm b/src/admin/templets/friendlink_edit.htm index 1661fc5a..8dff2f04 100644 --- a/src/admin/templets/friendlink_edit.htm +++ b/src/admin/templets/friendlink_edit.htm @@ -41,7 +41,7 @@ - + diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm index 6ded6124..bc0d4d31 100644 --- a/src/admin/templets/member_toadmin.htm +++ b/src/admin/templets/member_toadmin.htm @@ -14,7 +14,7 @@ function checkSubmit() { if (document.form2.email.value == "") { document.form2.email.focus(); - ShowMsg("Email不能为空"); + ShowMsg("邮箱不能为空"); return false; } if (document.form2.uname.value == "") { diff --git a/src/admin/templets/member_view.htm b/src/admin/templets/member_view.htm index 1814ebfb..3ed429d7 100644 --- a/src/admin/templets/member_view.htm +++ b/src/admin/templets/member_view.htm @@ -16,7 +16,7 @@ if (document.form2.email.value=="") { document.form2.email.focus(); - ShowMsg("Email不能为空"); + ShowMsg("邮箱不能为空"); return false; } if (document.form2.uname.value=="") diff --git a/src/apps/recommend.php b/src/apps/recommend.php index 4336d0e1..be0e2264 100755 --- a/src/apps/recommend.php +++ b/src/apps/recommend.php @@ -32,7 +32,7 @@ if ($action == '') { //发送推荐信息 else if ($action == 'send') { if (!CheckEmail($email)) { - ShowMsg("Email格式不正确", -1); + ShowMsg("邮箱格式不正确", -1); exit(); } $mailbody = ''; diff --git a/src/static/web/js/member.album.js b/src/static/web/js/member.album.js index 1c6bc5e7..7cce829c 100644 --- a/src/static/web/js/member.album.js +++ b/src/static/web/js/member.album.js @@ -1,22 +1,16 @@ function checkSubmit() { if (document.form1.title.value=='') { - alert("图片标题不能为空"); + alert("文档标题不能为空"); document.form1.title.focus(); return false; } if (document.form1.typeid.value==0) { - alert("所属栏目必须选择"); - return false; - } - if (document.form1.typeid.options[document.form1.typeid.selectedIndex].className!='option3') - { - alert("所属栏目必须选择白色背景的项目"); + alert("请您选择文档所属栏目"); return false; } document.form1.imagebody.value = document.getElementById('copyhtml').innerHTML; document.getElementById('postloader').style.display = 'block'; - } function CheckSelTable(nnum){ var cbox = document.getElementById('isokcheck'+nnum); diff --git a/src/static/web/js/user.js b/src/static/web/js/user.js index f904c59d..44acbe71 100644 --- a/src/static/web/js/user.js +++ b/src/static/web/js/user.js @@ -5,7 +5,7 @@ function checkSubmit(t) { return false; } if (document.addcontent.typeid.value == 0) { - ShowMsg("隶属栏目必须选择"); + ShowMsg("请您选择文档所属栏目"); return false; } } \ No newline at end of file diff --git a/src/theme/plus/flink-add.htm b/src/theme/plus/flink-add.htm index 494edec9..34659471 100644 --- a/src/theme/plus/flink-add.htm +++ b/src/theme/plus/flink-add.htm @@ -25,7 +25,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/src/theme/plus/recommend.htm b/src/theme/plus/recommend.htm index acf97c16..cb7fb417 100644 --- a/src/theme/plus/recommend.htm +++ b/src/theme/plus/recommend.htm @@ -20,7 +20,7 @@
网址：
站长Email：邮箱：
- + diff --git a/src/user/edit_baseinfo.php b/src/user/edit_baseinfo.php index ce4b238b..c692abc3 100755 --- a/src/user/edit_baseinfo.php +++ b/src/user/edit_baseinfo.php @@ -18,12 +18,12 @@ if ($dopost == 'save') { CheckCSRF(); if (function_exists('password_hash') && !empty($row['pwd_new'])) { if (!is_array($row) || !password_verify($oldpwd, $row['pwd_new'])) { - ShowMsg('您输入的旧密码错误或没填写，不允许修改资料', '-1'); + ShowMsg('您输入的旧密码错误或没填写，修改资料失败', '-1'); exit(); } } else { if (!is_array($row) || $row['pwd'] != md5($oldpwd)) { - ShowMsg('您输入的旧密码错误或没填写，不允许修改资料', '-1'); + ShowMsg('您输入的旧密码错误或没填写，修改资料失败', '-1'); exit(); } } @@ -56,16 +56,16 @@ if ($dopost == 'save') { $pwd2 = substr(md5($userpwd), 5, 20); } } - //修改安全问题或Email + //修改安全问题或邮箱 if ($email != $row['email'] || ($newsafequestion != 0 && $newsafeanswer != '')) { if ($row['safequestion'] != 0 && ($row['safequestion'] != $safequestion || $row['safeanswer'] != $safeanswer)) { - ShowMsg('您的旧安全问题及答案不正确，不能修改Email或安全问题', '-1'); + ShowMsg('您的旧安全问题及答案不正确，不能修改邮箱或安全问题', '-1'); exit(); } - //修改Email + //修改邮箱 if ($email != $row['email']) { if (!CheckEmail($email)) { - ShowMsg('Email格式不正确', '-1'); + ShowMsg('邮箱格式不正确', '-1'); exit(); } else { $addupquery .= ",email='$email'"; diff --git a/src/user/edit_email.php b/src/user/edit_email.php index 01f13771..dd2392f3 100644 --- a/src/user/edit_email.php +++ b/src/user/edit_email.php @@ -14,13 +14,13 @@ if (!isset($backurl)) { } if ($dopost == 'save') { if (!empty($cfg_ml->fields['email']) || $cfg_ml->fields['checkmail'] != -1) { - ShowMsg('Email已经设置，无需重复提交', '-1'); + ShowMsg('邮箱已经设置，无需重复提交', '-1'); exit(); } //校验CSRF CheckCSRF(); if (!CheckEmail($email)) { - ShowMsg('Email格式不正确', '-1'); + ShowMsg('邮箱格式不正确', '-1'); exit(); } $email = HtmlReplace($email, -1); diff --git a/src/user/index_do.php b/src/user/index_do.php index 03b10bb0..be10da6c 100755 --- a/src/user/index_do.php +++ b/src/user/index_do.php @@ -102,20 +102,20 @@ else if ($fmdo == 'user') { echo $msg; exit(); } - //检查email是否存在 + //检查邮箱是否存在 else if ($dopost == "checkmail") { AjaxHead(); if ($cfg_md_mailtest == 'N') { $msg = "√可以使用"; } else { if (!CheckEmail($email)) { - $msg = "×Email格式有误"; + $msg = "×邮箱格式有误"; } else { $row = $dsql->GetOne("SELECT mid FROM `#@__member` WHERE email LIKE '$email' LIMIT 1"); if (!is_array($row)) { $msg = "√可以使用"; } else { - $msg = "×Email已经被另一个帐号占用"; + $msg = "×邮箱已经被另一个帐号占用"; } } } diff --git a/src/user/templets/album_add.htm b/src/user/templets/album_add.htm index 911f935f..04ca7311 100755 --- a/src/user/templets/album_add.htm +++ b/src/user/templets/album_add.htm @@ -45,7 +45,7 @@
"; + echo ""; @@ -57,10 +57,7 @@
- + diff --git a/src/user/templets/album_edit.htm b/src/user/templets/album_edit.htm index 7fbf8fd7..c132decd 100755 --- a/src/user/templets/album_edit.htm +++ b/src/user/templets/album_edit.htm @@ -49,7 +49,7 @@
"; + echo ""; ?> diff --git a/src/user/templets/archives_add.htm b/src/user/templets/archives_add.htm index 575b222c..b18c7e38 100755 --- a/src/user/templets/archives_add.htm +++ b/src/user/templets/archives_add.htm @@ -44,7 +44,7 @@
"; + echo ""; @@ -56,10 +56,7 @@
- +
diff --git a/src/user/templets/archives_edit.htm b/src/user/templets/archives_edit.htm index 0a59a65c..8774aeab 100755 --- a/src/user/templets/archives_edit.htm +++ b/src/user/templets/archives_edit.htm @@ -44,7 +44,7 @@
"; + echo ""; ?> diff --git a/src/user/templets/archives_sg_add.htm b/src/user/templets/archives_sg_add.htm index aa6834a3..4fb62df5 100755 --- a/src/user/templets/archives_sg_add.htm +++ b/src/user/templets/archives_sg_add.htm @@ -44,7 +44,7 @@
"; + echo ""; @@ -56,10 +56,7 @@
- +
diff --git a/src/user/templets/archives_sg_edit.htm b/src/user/templets/archives_sg_edit.htm index c8d2cbd7..cb6de420 100755 --- a/src/user/templets/archives_sg_edit.htm +++ b/src/user/templets/archives_sg_edit.htm @@ -40,7 +40,7 @@
"; + echo ""; ?> diff --git a/src/user/templets/article_add.htm b/src/user/templets/article_add.htm index 43c4c4c0..6c609c96 100755 --- a/src/user/templets/article_add.htm +++ b/src/user/templets/article_add.htm @@ -44,7 +44,7 @@
"; + echo ""; @@ -56,10 +56,7 @@
- +
diff --git a/src/user/templets/article_edit.htm b/src/user/templets/article_edit.htm index f79586e1..f501ecbf 100755 --- a/src/user/templets/article_edit.htm +++ b/src/user/templets/article_edit.htm @@ -48,7 +48,7 @@
"; + echo ""; ?> diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm index 96ab9082..6ab24b5e 100755 --- a/src/user/templets/edit_baseinfo.htm +++ b/src/user/templets/edit_baseinfo.htm @@ -38,22 +38,22 @@
M_LoginID;?>
- -
+ +
个人会员该项为昵称，企业会员填写公司名称
-
+
-
+
不修改密码请保留此项为空
-
+
不修改密码请保留此项为空
@@ -106,7 +106,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) { @@ -116,17 +116,17 @@ } if (document.form2.email.value == "") { document.form2.email.focus(); - ShowMsg("Email不能为空"); + ShowMsg("请您填写邮箱"); return false; } if (document.form2.uname.value == "") { document.form2.uname.focus(); - ShowMsg("用户昵称不能为空"); + ShowMsg("请您填写昵称"); return false; } if (document.form2.vdcode.value == "") { document.form2.vdcode.focus(); - ShowMsg("验证码不能为空"); + ShowMsg("请您填写验证码"); return false; } } diff --git a/src/user/templets/soft_add.htm b/src/user/templets/soft_add.htm index 3405377f..30a86ae8 100755 --- a/src/user/templets/soft_add.htm +++ b/src/user/templets/soft_add.htm @@ -23,10 +23,8 @@ } } function ShowHideAddr() { - document.getElementById('morelink').style.display = (document.getElementById('morelink').style.display == - 'block' ? 'none' : 'block'); - document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏地址' : - '显示地址'); + document.getElementById('morelink').style.display = (document.getElementById('morelink').style.display == 'block' ? 'none' : 'block'); + document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏地址' : '显示地址'); } @@ -63,7 +61,7 @@
"; + echo ""; @@ -159,10 +157,7 @@
- +
@@ -181,15 +176,6 @@ ";?>
-
- -
-
- - -
-
-
diff --git a/src/user/templets/soft_edit.htm b/src/user/templets/soft_edit.htm index 1167042c..0f7f8784 100755 --- a/src/user/templets/soft_edit.htm +++ b/src/user/templets/soft_edit.htm @@ -23,10 +23,8 @@ } } function ShowHideAddr() { - document.getElementById('morelink').style.display = (document.getElementById('morelink').style.display == - 'block' ? 'none' : 'block'); - document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏地址' : - '显示地址'); + document.getElementById('morelink').style.display = (document.getElementById('morelink').style.display == 'block' ? 'none' : 'block'); + document.getElementById('btsh3').value = (document.getElementById('morelink').style.display == 'block' ? '隐藏地址' : '显示地址'); } @@ -66,7 +64,7 @@
"; + echo ""; ?>
您好友的Email：您好友的邮箱：