From cbd5f17d11997fa47e5c4dfe89a4a0299bcc57eb 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: Mon, 30 Oct 2023 18:01:15 +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                   | 4 ++--
 src/system/memberlogin.class.php           | 2 +-
 src/user/reg_new.php                       | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/admin/member_toadmin.php b/src/admin/member_toadmin.php
index d7b0b3a9..06ead510 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-9a-zA-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 8a769328..d3fb161d 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-9a-zA-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 f7c407e8..d889a03e 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-9a-zA-Z_@!.-]', '-1');
         exit();
     }
     if (preg_match("#[^0-9a-zA-Z_@!\.-]#", $userid)) {
-        ShowMsg('账号不合法，使用[0-9a-zA-Z_@!.-]范围以内字符', '-1');
+        ShowMsg('账号不合法，仅限使用[0-9a-zA-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 2ebba172..f7fa88de 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-9a-zA-Z_@!.-]）</span>
 					</td>
 				</tr>
 				<tr>
diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm
index c0558ffe..6cbe915e 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-9a-zA-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 a31aacd4..d3992237 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-9a-zA-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-9a-zA-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 ec009eed..414c218a 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-9a-zA-Z_@!.-]）</span>
 					</td>
 				</tr>
 				<tr>
diff --git a/src/install/install.html b/src/install/install.html
index 14797eb8..e3e47fac 100644
--- a/src/install/install.html
+++ b/src/install/install.html
@@ -90,12 +90,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-9a-zA-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-9a-zA-Z_@!.-]</div>
 						</div>
 						<div class="text-right"><button type="submit" class="btn btn-success">安装</button></div>
 					</form>
diff --git a/src/system/memberlogin.class.php b/src/system/memberlogin.class.php
index d015baf9..281c302c 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-9a-zA-Z_@!.-]';
             }
         }
     }
diff --git a/src/user/reg_new.php b/src/user/reg_new.php
index b6cab0ec..108ff669 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-9a-zA-Z_@!.-]', '-1');
             exit();
         }
         if ($pwdc != $pwd) {