From d44c0e8d3fb70f0617ebd1ee18b2f7aca1095a11 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, 29 Jun 2023 01:17:12 +0800
Subject: [PATCH] =?UTF-8?q?30px=E8=A1=8C=E9=AB=98=EF=BC=8C=E6=96=87?=
=?UTF-8?q?=E5=AD=97=E4=BF=AE=E6=AD=A3=E8=B4=A6=E5=8F=B7=EF=BC=8C=E5=AF=86?=
=?UTF-8?q?=E7=A0=81=EF=BC=8C=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/admin/config.php | 2 +-
src/admin/index_testenv.php | 2 +-
src/admin/member_do.php | 6 +--
src/admin/member_pmone.php | 8 ++--
src/admin/sys_admin_user_add.php | 6 +--
src/admin/sys_admin_user_edit.php | 6 +--
src/admin/sys_group_edit.php | 2 +-
src/admin/templets/album_add.htm | 6 +--
src/admin/templets/album_edit.htm | 6 +--
src/admin/templets/archives_add.htm | 6 +--
src/admin/templets/archives_edit.htm | 6 +--
src/admin/templets/archives_sg_add.htm | 4 +-
src/admin/templets/archives_sg_edit.htm | 4 +-
src/admin/templets/article_add.htm | 10 ++---
src/admin/templets/article_edit.htm | 6 +--
src/admin/templets/catalog_add.htm | 10 ++---
src/admin/templets/catalog_edit.htm | 6 +--
src/admin/templets/diy_list.htm | 4 +-
src/admin/templets/freelist_add.htm | 12 +++---
src/admin/templets/freelist_edit.htm | 10 ++---
src/admin/templets/member_edit.htm | 2 +-
src/admin/templets/member_main.htm | 2 +-
src/admin/templets/member_pm.htm | 2 +-
src/admin/templets/member_pmall.htm | 2 +-
src/admin/templets/member_pmone.htm | 2 +-
src/admin/templets/member_toadmin.htm | 2 +-
src/admin/templets/mychannel_field_add.htm | 2 +-
src/admin/templets/mychannel_field_edit.htm | 2 +-
src/admin/templets/soft_add.htm | 6 +--
src/admin/templets/soft_edit.htm | 6 +--
src/admin/templets/spec_add.htm | 4 +-
src/admin/templets/spec_edit.htm | 4 +-
src/admin/templets/sys_admin_user.htm | 2 +-
src/admin/templets/sys_admin_user_add.htm | 6 +--
src/admin/templets/sys_admin_user_edit.htm | 2 +-
src/admin/templets/sys_login.htm | 2 +-
src/static/web/css/admin.css | 39 ++++++++++++-------
src/static/web/css/style.css | 2 +-
src/system/memberlogin.class.php | 22 +++++------
src/system/userlogin.class.php | 4 +-
src/theme/dedebiz/widget_article_feedback.htm | 2 +-
src/user/inc/inc_pwd_functions.php | 4 +-
src/user/index_do.php | 10 ++---
src/user/reg_new.php | 10 ++---
src/user/resetpassword.php | 6 +--
src/user/templets/edit_baseinfo.htm | 2 +-
src/user/templets/login.htm | 10 ++---
src/user/templets/reg-new.htm | 12 +++---
src/user/templets/resetpassword.htm | 4 +-
src/user/templets/resetpassword2.htm | 2 +-
50 files changed, 156 insertions(+), 143 deletions(-)
diff --git a/src/admin/config.php b/src/admin/config.php
index cb04f043..d010f0cb 100644
--- a/src/admin/config.php
+++ b/src/admin/config.php
@@ -138,7 +138,7 @@ function DedeInclude($filename, $isabs = FALSE)
return $isabs ? $filename : DEDEADMIN.'/'.$filename;
}
/**
- * 根据会员mid获取会员名称
+ * 根据会员mid获取账号
*
* @access public
* @param int $mid 会员id
diff --git a/src/admin/index_testenv.php b/src/admin/index_testenv.php
index 6f503c6b..fc2afeac 100644
--- a/src/admin/index_testenv.php
+++ b/src/admin/index_testenv.php
@@ -78,7 +78,7 @@ if (!function_exists('PostHost')) {
}
}
if (!function_exists('TestAdminPWD')) {
- //返回结果,1没有修改默认管理员名称,2没有修改默认管理员会员名和密码,3没有发现默认账号
+ //返回结果,1没有修改默认管理员名称,2没有修改默认管理员账号和密码,3没有发现默认账号
function TestAdminPWD()
{
global $dsql;
diff --git a/src/admin/member_do.php b/src/admin/member_do.php
index e7b1d540..5a99a9d5 100644
--- a/src/admin/member_do.php
+++ b/src/admin/member_do.php
@@ -52,7 +52,7 @@ if ($dopost == "delmember") {
exit();
}
}
- ShowMsg("成功删除一个会员", $ENV_GOBACK_URL);
+ ShowMsg("成功删除一个账户", $ENV_GOBACK_URL);
exit();
}
$randcode = mt_rand(10000, 99999);
@@ -124,11 +124,11 @@ else if ($dopost == "recommend") {
$id = preg_replace("#[^0-9]#", "", $id);
if ($matt == 0) {
$dsql->ExecuteNoneQuery("UPDATE `#@__member` SET matt=1 WHERE mid='$id' AND matt<>10 LIMIT 1");
- ShowMsg("成功设置一个会员推荐", $ENV_GOBACK_URL);
+ ShowMsg("成功设置一个账户推荐", $ENV_GOBACK_URL);
exit();
} else {
$dsql->ExecuteNoneQuery("UPDATE `#@__member` SET matt=0 WHERE mid='$id' AND matt<>10 LIMIT 1");
- ShowMsg("成功取消一个会员推荐", $ENV_GOBACK_URL);
+ ShowMsg("成功取消一个账户推荐", $ENV_GOBACK_URL);
exit();
}
}
diff --git a/src/admin/member_pmone.php b/src/admin/member_pmone.php
index 70303425..0c4b5a2e 100644
--- a/src/admin/member_pmone.php
+++ b/src/admin/member_pmone.php
@@ -1,6 +1,6 @@
GetOne("SELECT COUNT(*) AS dd FROM `#@__member` WHERE userid LIKE '$userid' ");
if ($row['dd'] > 0) {
- ShowMsg('会员名已存在', '-1');
+ ShowMsg('账号已存在', '-1');
exit();
}
$pfd = "pwd";
@@ -60,7 +60,7 @@ if ($dopost == 'add') {
$adminquery = "Insert Into `#@__member_space` (`mid`,`pagesize`,`matt`,`spacename`,`spacelogo`,`spacestyle`,`sign`,`spacenews`)
VALUES ('$mid','10','0','{$uname}的空间','','person','',''); ";
$dsql->ExecuteNoneQuery($adminquery);
- ShowMsg('成功添加一个用户', 'sys_admin_user.php');
+ ShowMsg('成功添加一个账户', 'sys_admin_user.php');
exit();
}
$randcode = mt_rand(10000, 99999);
diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php
index 32b5a7ca..873e7faa 100644
--- a/src/admin/sys_admin_user_edit.php
+++ b/src/admin/sys_admin_user_edit.php
@@ -47,12 +47,12 @@ if ($dopost == 'saveedit') {
if ($olduserid !== $userid) {
$row = $dsql->GetOne("SELECT mid FROM `#@__member` WHERE userid LIKE '$userid' ");
if (is_array($row)) {
- ShowMsg("您指定的会员名{$userid}已存在,请使用别的会员名", "-1");
+ ShowMsg("您指定的账号{$userid}已存在,请使用别的账号", "-1");
exit();
}
$row = $dsql->GetOne("SELECT id FROM `#@__admin` WHERE userid LIKE '$userid' ");
if (is_array($row)) {
- ShowMsg("您指定的会员名{$userid}已存在,请使用别的会员名", "-1");
+ ShowMsg("您指定的账号{$userid}已存在,请使用别的账号", "-1");
exit();
}
$usql = ",userid='$userid'";
@@ -65,7 +65,7 @@ if ($dopost == 'saveedit') {
$dsql->ExecuteNoneQuery($query);
$query = "UPDATE `#@__member` SET uname='$uname',email='$email'$pwdm $usql WHERE mid='$id'";
$dsql->ExecuteNoneQuery($query);
- ShowMsg("成功修改一个用户", "sys_admin_user.php");
+ ShowMsg("成功修改一个账户", "sys_admin_user.php");
exit();
} else if ($dopost == 'delete') {
if (empty($userok)) $userok = "";
diff --git a/src/admin/sys_group_edit.php b/src/admin/sys_group_edit.php
index d8df7c01..7d6cea98 100644
--- a/src/admin/sys_group_edit.php
+++ b/src/admin/sys_group_edit.php
@@ -28,7 +28,7 @@ if ($dopost == 'save') {
exit();
} else if ($dopost == 'del') {
$dsql->ExecuteNoneQuery("DELETE FROM `#@__admintype` WHERE CONCAT(`rank`)='$rank' AND `system`='0';");
- ShowMsg("成功删除一个会员组", "sys_group.php");
+ ShowMsg("成功删除一个账户组", "sys_group.php");
exit();
}
$groupRanks = array();
diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm
index 8081271f..0ceb7110 100644
--- a/src/admin/templets/album_add.htm
+++ b/src/admin/templets/album_add.htm
@@ -96,7 +96,7 @@
缩略图: |
-
+
上传图片
@@ -139,7 +139,7 @@
echo "";
?>
-
+
选择副栏目";
@@ -160,7 +160,7 @@
|
-
+
|
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm
index 36b444c0..d5d1bb19 100644
--- a/src/admin/templets/album_edit.htm
+++ b/src/admin/templets/album_edit.htm
@@ -97,7 +97,7 @@
缩略图: |
-
+
上传图片
@@ -138,7 +138,7 @@
echo $typeOptions;
echo '';
?>
-
+
|
需要金币: |
|
@@ -155,7 +155,7 @@
-
+
|
diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm
index 558b36dd..9ebca2aa 100644
--- a/src/admin/templets/archives_add.htm
+++ b/src/admin/templets/archives_add.htm
@@ -90,7 +90,7 @@
缩略图: |
-
+
上传图片
@@ -140,7 +140,7 @@
echo "";
?>
-
+
选择副栏目";
@@ -161,7 +161,7 @@
|
-
+
|
diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm
index f231aeaf..17881ec3 100644
--- a/src/admin/templets/archives_edit.htm
+++ b/src/admin/templets/archives_edit.htm
@@ -92,7 +92,7 @@
缩略图: |
-
+
上传图片
@@ -142,7 +142,7 @@
echo $typeOptions;
echo "";
?>
-
+
|
需要金币: |
|
@@ -159,7 +159,7 @@
-
+
|
diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm
index e15d4b19..1ee9617d 100644
--- a/src/admin/templets/archives_sg_add.htm
+++ b/src/admin/templets/archives_sg_add.htm
@@ -63,7 +63,7 @@
缩略图: |
-
+
上传图片
@@ -93,7 +93,7 @@
echo "";
?>
-
+
|
diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm
index 2c55545c..82475b4e 100644
--- a/src/admin/templets/archives_sg_edit.htm
+++ b/src/admin/templets/archives_sg_edit.htm
@@ -67,7 +67,7 @@
缩略图: |
-
+
上传图片
@@ -95,7 +95,7 @@
echo $typeOptions;
echo "";
?>
-
+
|
diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm
index 12178c4d..42c118e7 100644
--- a/src/admin/templets/article_add.htm
+++ b/src/admin/templets/article_add.htm
@@ -90,7 +90,7 @@
缩略图: |
-
+
上传图片
@@ -133,7 +133,7 @@
echo "";
?>
-
+
选择副栏目";
@@ -154,7 +154,7 @@
|
-
+
|
@@ -208,8 +208,8 @@
分页方式: |
-
-
+
+
|
diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm
index cef9ae58..1ea405d0 100644
--- a/src/admin/templets/article_edit.htm
+++ b/src/admin/templets/article_edit.htm
@@ -97,7 +97,7 @@
缩略图: |
-
+
上传图片
@@ -138,7 +138,7 @@
echo $typeOptions;
echo "";
?>
-
+
|
需要金币: |
|
@@ -155,7 +155,7 @@
-
+
|
diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm
index 32362774..8bfc6950 100644
--- a/src/admin/templets/catalog_add.htm
+++ b/src/admin/templets/catalog_add.htm
@@ -166,9 +166,9 @@
栏目交叉: |
-
-
-
+
+
+
交叉栏目是大栏目与另一个非子栏目交叉的情况,相当于副栏目功能,需要在栏目里设置好
@@ -265,8 +265,8 @@
| 是否支持跨站调用: |
-
-
+
+
|
diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm
index 92ba7c29..58c83f38 100644
--- a/src/admin/templets/catalog_edit.htm
+++ b/src/admin/templets/catalog_edit.htm
@@ -152,9 +152,9 @@
栏目交叉: |
-
-
-
+
+
+
交叉栏目是大栏目与另一个非子栏目交叉的情况,相当于副栏目功能,需要在栏目里设置好
diff --git a/src/admin/templets/diy_list.htm b/src/admin/templets/diy_list.htm
index 4bbafcfe..f0fd18d3 100644
--- a/src/admin/templets/diy_list.htm
+++ b/src/admin/templets/diy_list.htm
@@ -38,8 +38,8 @@
|
-
-
+
+
预览
|
diff --git a/src/admin/templets/freelist_add.htm b/src/admin/templets/freelist_add.htm
index 77483f40..011df644 100644
--- a/src/admin/templets/freelist_add.htm
+++ b/src/admin/templets/freelist_add.htm
@@ -65,7 +65,7 @@
目录默认页名称: |
-
+
|
@@ -144,9 +144,9 @@
-
-
-
+
+
+
|
@@ -162,8 +162,8 @@
-
-
+
+
diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm
index c417e8f1..60eb9009 100644
--- a/src/admin/templets/freelist_edit.htm
+++ b/src/admin/templets/freelist_edit.htm
@@ -137,9 +137,9 @@
if ($setype=='') $setype = 'X';
?>
高级筛选:
-
-
-
+
+
+
@@ -167,8 +167,8 @@
-
-
+
+
diff --git a/src/admin/templets/member_edit.htm b/src/admin/templets/member_edit.htm
index 2842e51a..a41c075f 100644
--- a/src/admin/templets/member_edit.htm
+++ b/src/admin/templets/member_edit.htm
@@ -21,7 +21,7 @@
该会员关连网站管理员,修改不当会导致无法登录 | ';?>
- 头像/会员名: |
+ 头像/账号: |
";};echo "".$row['userid']."";?>
diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm
index c7be3f84..8deeb7ca 100644
--- a/src/admin/templets/member_main.htm
+++ b/src/admin/templets/member_main.htm
@@ -57,7 +57,7 @@
|
选择 |
mid |
- 头像/会员名 |
+ 头像/账号 |
昵称 |
等级 |
钱包积分 |
diff --git a/src/admin/templets/member_pm.htm b/src/admin/templets/member_pm.htm
index 17ef982e..95375160 100644
--- a/src/admin/templets/member_pm.htm
+++ b/src/admin/templets/member_pm.htm
@@ -15,7 +15,7 @@
-
+
|
diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm
index d4f957ea..7e53ca75 100644
--- a/src/admin/templets/spec_add.htm
+++ b/src/admin/templets/spec_add.htm
@@ -110,7 +110,7 @@
缩略图: |
-
+
上传图片
@@ -143,7 +143,7 @@
echo $typeOptions;
echo "";
?>
-
+
|
diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm
index 3e900e12..4e3e0329 100644
--- a/src/admin/templets/spec_edit.htm
+++ b/src/admin/templets/spec_edit.htm
@@ -110,7 +110,7 @@
缩略图: |
-
+
上传图片
@@ -143,7 +143,7 @@
echo $typeOptions;
echo "";
?>
-
+
|
diff --git a/src/admin/templets/sys_admin_user.htm b/src/admin/templets/sys_admin_user.htm
index 2a0ffd4f..8ba7af7b 100644
--- a/src/admin/templets/sys_admin_user.htm
+++ b/src/admin/templets/sys_admin_user.htm
@@ -24,7 +24,7 @@
管理员管理 |
- 会员名 |
+ 账号 |
昵称 |
等级 |
地址时间 |
diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm
index 09e7ff5e..6fa5d936 100644
--- a/src/admin/templets/sys_admin_user_add.htm
+++ b/src/admin/templets/sys_admin_user_add.htm
@@ -20,7 +20,7 @@
添加管理员 |
- 会员名: |
+ 账号: |
(使用[0-9a-zA-Z_@!.-]范围以内字符)
@@ -89,7 +89,7 @@
|