From 04c23870f7973bd03597b444bb278a38874a290a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?= Date: Thu, 22 Apr 2021 23:14:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E8=A7=84=E5=88=99=E6=81=A2=E5=A4=8D=E5=AF=B9?= =?UTF-8?q?=E5=A4=A7=E5=86=99=E5=AD=97=E6=AF=8D=E5=9F=9F=E5=90=8D=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- upload/source/admincp/admincp_domain.php | 2 ++ upload/source/language/lang_admincp_msg.php | 2 +- upload/source/plugin/wechat/wsq_setting.inc.php | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/upload/source/admincp/admincp_domain.php b/upload/source/admincp/admincp_domain.php index be4757d81..3ad43b3d9 100644 --- a/upload/source/admincp/admincp_domain.php +++ b/upload/source/admincp/admincp_domain.php @@ -59,6 +59,7 @@ if($operation == 'app') { $_G['setting']['domain']['app'] = array(); $appset = false; foreach($_GET['appnew'] as $appkey => $domain) { + $domain = strtolower($domain); if(!empty($domain) && !preg_match('/^((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}$/', $domain)) { cpmsg('setting_domain_http_error', '', 'error'); } @@ -119,6 +120,7 @@ if($operation == 'app') { $oldroot = $_G['setting']['domain']['root']; $_G['setting']['domain']['root'] = array(); foreach($_GET['domainnew'] as $idtype => $domain) { + $domain = strtolower($domain); if(!empty($domain) && !preg_match('/^((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}$/', $domain)) { cpmsg('setting_domain_http_error', '', 'error'); } diff --git a/upload/source/language/lang_admincp_msg.php b/upload/source/language/lang_admincp_msg.php index 6b597976a..1b4ad7de8 100644 --- a/upload/source/language/lang_admincp_msg.php +++ b/upload/source/language/lang_admincp_msg.php @@ -32,7 +32,7 @@ $lang = array ( 'database_export_multivol_succeed' => '恭喜您，成功创建 {volume} 个备份文件，备份全部完成。
{filelist}', 'database_export_zip_succeed' => '数据成功备份并压缩至服务器 {filename} 中', 'setting_update_succeed' => '当前设置更新成功 ', - 'setting_domain_http_error' => '请您填写合法的域名，常见错误为域名内包含大写字符、未转换为 Punycode 的 IDN 、以 “http://”、“.”开头或者以“/”、“/index.php”、“.”结尾等', + 'setting_domain_http_error' => '请您填写合法的域名，常见错误为以 “http://”、“.”开头或者以“/”、“/index.php”、“.”结尾，或域名包含未转换为 Punycode 的国际化域名等', 'orders_validate_succeed' => '订单处理成功 ', 'faq_list_update' => '帮助列表更新成功 ', 'forums_edit_succeed' => '版块设置更新成功 ', diff --git a/upload/source/plugin/wechat/wsq_setting.inc.php b/upload/source/plugin/wechat/wsq_setting.inc.php index fa3abe150..e7fb67be3 100644 --- a/upload/source/plugin/wechat/wsq_setting.inc.php +++ b/upload/source/plugin/wechat/wsq_setting.inc.php @@ -168,6 +168,9 @@ if(!submitcheck('settingsubmit')) { } if(function_exists('domain_create')) { + if(isset($_GET['setting']['wsq_domain'])) { + $_GET['setting']['wsq_domain'] = strtolower($_GET['setting']['wsq_domain']); + } if(!empty($_GET['setting']['wsq_domain']) && !preg_match('/^((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}$/', $_GET['setting']['wsq_domain'])) { cpmsg('setting_domain_http_error', '', 'error'); } -- Gitee