From eaba8a090e387cf12a988a2ee278cd1837b0b5ea Mon Sep 17 00:00:00 2001 From: Valery Votintsev Date: Wed, 3 Feb 2021 21:02:07 +0300 Subject: [PATCH 1/2] Move language strings from misc_security.php to lang_core.php --- upload/source/include/misc/misc_security.php | 14 +++----------- upload/source/language/lang_core.php | 8 +++++++- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/upload/source/include/misc/misc_security.php b/upload/source/include/misc/misc_security.php index 181dc14a1..25a4fc1c9 100644 --- a/upload/source/include/misc/misc_security.php +++ b/upload/source/include/misc/misc_security.php @@ -72,17 +72,9 @@ if($attackevasive & 8) { function securitymessage($subject, $message, $reload = TRUE, $form = FALSE) { global $_G; - $scuritylang = array( - 'attackevasive_1_subject' => '频繁刷新限制', - 'attackevasive_1_message' => '您访问本站速度过快或者刷新间隔时间小于两秒！请等待页面自动跳转 ...', - 'attackevasive_2_subject' => '代理服务器访问限制', - 'attackevasive_2_message' => '本站现在限制使用代理服务器访问，请去除您的代理设置，直接访问本站。', - 'attackevasive_4_subject' => '页面重载开启', - 'attackevasive_4_message' => '欢迎光临本站，页面正在重新载入，请稍候 ...' - ); - - $subject = $scuritylang[$subject] ? $scuritylang[$subject] : $subject; - $message = $scuritylang[$message] ? $scuritylang[$message] : $message; + + $subject = lang('core', $subject) ? lang('core', $subject) : $subject; + $message = lang('core', $message) ? lang('core', $message) : $message; if($_GET['inajax']) { security_ajaxshowheader(); echo '
'.$subject.'

'.$message.'
'; diff --git a/upload/source/language/lang_core.php b/upload/source/language/lang_core.php index 2b7f8dba9..5a199e20c 100644 --- a/upload/source/language/lang_core.php +++ b/upload/source/language/lang_core.php @@ -219,6 +219,12 @@ $lang = array 'page' => '第{page}页', 'close' => '关闭', -); + + 'attackevasive_1_subject' => '频繁刷新限制', + 'attackevasive_1_message' => '您访问本站速度过快或者刷新间隔时间小于两秒！请等待页面自动跳转 ...', + 'attackevasive_2_subject' => '代理服务器访问限制', + 'attackevasive_2_message' => '本站现在限制使用代理服务器访问，请去除您的代理设置，直接访问本站。', + 'attackevasive_4_subject' => '页面重载开启', + 'attackevasive_4_message' => '欢迎光临本站，页面正在重新载入，请稍候 ...' ?> \ No newline at end of file -- Gitee From b87a553a3b0fdd02f5ddfce193d7b0ae83502ccb Mon Sep 17 00:00:00 2001 From: Valery Votintsev Date: Thu, 4 Feb 2021 11:00:51 +0300 Subject: [PATCH 2/2] Restore the ending ); in lang_core --- upload/source/language/lang_core.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/upload/source/language/lang_core.php b/upload/source/language/lang_core.php index 5a199e20c..70bb4e0c6 100644 --- a/upload/source/language/lang_core.php +++ b/upload/source/language/lang_core.php @@ -225,6 +225,7 @@ $lang = array 'attackevasive_2_subject' => '代理服务器访问限制', 'attackevasive_2_message' => '本站现在限制使用代理服务器访问，请去除您的代理设置，直接访问本站。', 'attackevasive_4_subject' => '页面重载开启', - 'attackevasive_4_message' => '欢迎光临本站，页面正在重新载入，请稍候 ...' + 'attackevasive_4_message' => '欢迎光临本站，页面正在重新载入，请稍候 ...', +); ?> \ No newline at end of file -- Gitee