diff --git a/upload/source/admincp/admincp_domain.php b/upload/source/admincp/admincp_domain.php
index be4757d81661dbf821a92b199ff2a461ee22da35..3ad43b3d95d34707992f184dd331f06391808086 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 6b597976a9eebd94ab62721b2c0b76a4acca1e0c..1b4ad7de869ecaf39d3ae71b2a0cf9eb71353140 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 fa3abe1505872c8451380c90aa51636e985c877c..e7fb67be342d474779cad42593423a60b55f845c 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');
}