From c1586a19e3d37b68d0413c6fca75d9549acba085 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?=
<2449271624@qq.com>
Date: Thu, 7 Dec 2023 17:06:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/admin/member_toadmin.php | 2 +-
src/admin/sys_admin_user_add.php | 2 +-
src/admin/sys_admin_user_edit.php | 4 ++--
src/admin/templets/member_edit.htm | 2 +-
src/admin/templets/member_toadmin.htm | 2 +-
src/admin/templets/sys_admin_user_add.htm | 4 ++--
src/admin/templets/sys_admin_user_edit.htm | 2 +-
src/install/install.html | 12 ++++--------
src/static/web/css/admin.css | 4 ++--
src/system/memberlogin.class.php | 2 +-
src/user/reg_new.php | 2 +-
11 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/src/admin/member_toadmin.php b/src/admin/member_toadmin.php
index 06ead510..3971dc10 100644
--- a/src/admin/member_toadmin.php
+++ b/src/admin/member_toadmin.php
@@ -18,7 +18,7 @@ $row = array();
if ($dopost == "toadmin") {
$pwd = trim($pwd);
if ($pwd != '' && preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd)) {
- ShowMsg('密码不合法，仅限使用[0-9a-zA-Z_@!.-]', '-1');
+ ShowMsg('密码不合法，请使用数字0-9小写a-z大写A-Z符号_@!.-', '-1');
exit();
}
$safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24);
diff --git a/src/admin/sys_admin_user_add.php b/src/admin/sys_admin_user_add.php
index d3fb161d..a7087181 100644
--- a/src/admin/sys_admin_user_add.php
+++ b/src/admin/sys_admin_user_add.php
@@ -15,7 +15,7 @@ if (empty($dopost)) $dopost = '';
if ($dopost == 'add') {
CheckCSRF();
if (preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd) || preg_match("#[^0-9a-zA-Z_@!\.-]#", $userid)) {
- ShowMsg('密码或账号不合法，仅限使用[0-9a-zA-Z_@!.-]', '-1');
+ ShowMsg('密码或账号不合法，请使用数字0-9小写a-z大写A-Z符号_@!.-', '-1');
exit();
}
$safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24);
diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php
index 47d70a7e..d3540cbf 100644
--- a/src/admin/sys_admin_user_edit.php
+++ b/src/admin/sys_admin_user_edit.php
@@ -17,11 +17,11 @@ if ($dopost == 'saveedit') {
CheckCSRF();
$pwd = trim($pwd);
if ($pwd != '' && preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd)) {
- ShowMsg('密码不合法，仅限使用[0-9a-zA-Z_@!.-]', '-1');
+ ShowMsg('密码不合法，请使用数字0-9小写a-z大写A-Z符号_@!.-', '-1');
exit();
}
if (preg_match("#[^0-9a-zA-Z_@!\.-]#", $userid)) {
- ShowMsg('账号不合法，仅限使用[0-9a-zA-Z_@!.-]', '-1');
+ ShowMsg('账号不合法，请使用数字0-9小写a-z大写A-Z符号_@!.-', '-1');
exit();
}
$safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24);
diff --git a/src/admin/templets/member_edit.htm b/src/admin/templets/member_edit.htm
index ef876c96..34829d67 100644
--- a/src/admin/templets/member_edit.htm
+++ b/src/admin/templets/member_edit.htm
@@ -37,7 +37,7 @@
<td>密码：</td>
<td>
<input type="text" name="pwd" id="pwd" class="admin-input-sm">
- <span>（留空则不修改，仅限使用[0-9a-zA-Z_@!.-]）</span>
+ <span>（留空则不修改，请使用数字0-9小写a-z大写A-Z符号_@!.-）</span>
</td>
</tr>
<tr>
diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm
index a1021318..571d0353 100644
--- a/src/admin/templets/member_toadmin.htm
+++ b/src/admin/templets/member_toadmin.htm
@@ -31,7 +31,7 @@
</tr>
<tr>
<td>密码：</td>
- <td><input type="text" name="pwd" id="pwd" class="admin-input-sm">（留空则不修改，仅限使用[0-9a-zA-Z_@!.-]）</td>
+ <td><input type="text" name="pwd" id="pwd" class="admin-input-sm">（留空则不修改，请使用数字0-9小写a-z大写A-Z符号_@!.-）</td>
</tr>
<tr>
<td>类型：</td>
diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm
index 4da730a6..180eda21 100644
--- a/src/admin/templets/sys_admin_user_add.htm
+++ b/src/admin/templets/sys_admin_user_add.htm
@@ -23,7 +23,7 @@
<td width="260">账号：</td>
<td>
<input type="text" name="userid" id="userid" class="admin-input-sm">
- <span>（仅限使用[0-9a-zA-Z_@!.-]）</span>
+ <span>（请使用数字0-9小写a-z大写A-Z符号_@!.-）</span>
</td>
</tr>
<tr>
@@ -37,7 +37,7 @@
<td>密码：</td>
<td>
<input type="text" name="pwd" id="pwd" class="admin-input-sm">
- <span>（仅限使用[0-9a-zA-Z_@!.-]）</span>
+ <span>（请使用数字0-9小写a-z大写A-Z符号_@!.-）</span>
</td>
</tr>
<tr>
diff --git a/src/admin/templets/sys_admin_user_edit.htm b/src/admin/templets/sys_admin_user_edit.htm
index 9dc72eee..31d89eb1 100644
--- a/src/admin/templets/sys_admin_user_edit.htm
+++ b/src/admin/templets/sys_admin_user_edit.htm
@@ -33,7 +33,7 @@
<td>密码：</td>
<td>
<input type="text" name="pwd" id="pwd" class="admin-input-sm">
- <span>（留空则不修改，仅限使用[0-9a-zA-Z_@!.-]）</span>
+ <span>（留空则不修改，请使用数字0-9小写a-z大写A-Z符号_@!.-）</span>
</td>
</tr>
<tr>
diff --git a/src/install/install.html b/src/install/install.html
index 4064c6fa..a1187390 100644
--- a/src/install/install.html
+++ b/src/install/install.html
@@ -41,8 +41,6 @@
<input type="hidden" name="step" value="2">
<input type="hidden" name="cookieencode" value="<?php echo $rnd_cookieEncode;?>">
<input type="hidden" name="adminmail" value="admin@dedebiz.com">
- <legend class="text-success">数据库设置</legend>
- <hr>
<div class="form-group">
<label for="dbtype" class="form-label">数据库类型</label>
<select id="dbtype" name="dbtype" class="form-control form-select">
@@ -56,7 +54,7 @@
<input type="text" name="dbhost" id="dbhost" class="form-control" placeholder="localhost">
</div>
<div class="form-group server">
- <label for="dbuser" class="form-label">数据库用户名</label>
+ <label for="dbuser" class="form-label">数据库账号</label>
<input type="text" name="dbuser" id="dbuser" class="form-control" placeholder="root">
</div>
<div class="form-group server">
@@ -76,10 +74,8 @@
</div>
</div>
<div id="alertConnect"></div>
- <legend class="text-success">站点设置</legend>
- <hr>
<div class="form-group">
- <label for="baseurl" class="form-label">网站网址</label>
+ <label for="baseurl" class="form-label">网站地址</label>
<input type="text" name="baseurl" id="baseurl" class="form-control" placeholder="<?php echo $baseurl;?>">
</div>
<div class="form-group">
@@ -89,12 +85,12 @@
<div class="form-group">
<label for="adminuser" class="form-label">管理员账号</label>
<input type="text" name="adminuser" id="adminuser" class="form-control" placeholder="admin">
- <div class="form-text">仅限使用[0-9a-zA-Z_@!.-]</div>
+ <div class="form-text">请使用数字0-9小写a-z大写A-Z符号_@!.-</div>
</div>
<div class="form-group">
<label for="adminpwd" class="form-label">管理员密码</label>
<input type="text" name="adminpwd" id="adminpwd" class="form-control" placeholder="admin">
- <div class="form-text">仅限使用[0-9a-zA-Z_@!.-]</div>
+ <div class="form-text">请使用数字0-9小写a-z大写A-Z符号_@!.-</div>
</div>
<div class="text-right"><button type="submit" class="btn btn-success">安装</button></div>
</form>
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index 546f1c24..a7aec019 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -25,8 +25,8 @@ textarea{padding:0.375rem 0.75rem;color:var(--gray);background:var(--white);bord
input:focus,select:focus,textarea:focus{color:var(--gray);background:var(--white);border-color:var(--blue-300);box-shadow:0 0 0 0.2rem rgba(0,123,255,0.25);outline:0}
.install-box{margin:0 auto;width:800px}
.install-box .card-header,.install-box .card-body{padding:1.25rem}
-.install-box h1,.install-box legend{margin:0;line-height:1.2;font-size:18px;font-weight:600;color:var(--gray-dark)}
-.install-box label,.login-box label{margin-bottom:5px}
+.install-box h1{margin:0;line-height:1.2;font-size:18px;font-weight:600;color:var(--gray-dark)}
+.install-box label,.login-box label{margin-bottom:0.25rem}
.install-box .form-control,.login-box .form-control{height:36px}
.login-head{padding:1rem 0;background:var(--white)}
.login-head .logo{font-size:18px;font-weight:600;color:var(--gray-dark)}
diff --git a/src/system/memberlogin.class.php b/src/system/memberlogin.class.php
index f9f6888f..e0f8fc87 100755
--- a/src/system/memberlogin.class.php
+++ b/src/system/memberlogin.class.php
@@ -45,7 +45,7 @@ function CheckUserID($uid, $msgtitle = '账号', $ckhas = TRUE)
}
} else {
if (preg_match("/[^0-9a-z@\.-]/i", $ck_uid[$i])) {
- return $msgtitle.'仅限使用[0-9a-zA-Z_@!.-]';
+ return $msgtitle.'请使用数字0-9小写a-z大写A-Z符号_@!.-';
}
}
}
diff --git a/src/user/reg_new.php b/src/user/reg_new.php
index 5b729cba..7e82f176 100755
--- a/src/user/reg_new.php
+++ b/src/user/reg_new.php
@@ -48,7 +48,7 @@ if ($step == 1) {
exit();
}
if (preg_match("#[^0-9a-zA-Z_@!\.-]#", $userid)) {
- ShowMsg('账号不合法，仅限使用[0-9a-zA-Z_@!.-]', '-1');
+ ShowMsg('账号不合法，请使用数字0-9小写a-z大写A-Z符号_@!.-', '-1');
exit();
}
if ($pwdc != $pwd) {