diff --git a/module/user/js/login.js b/module/user/js/login.js index 31fe0854f2..507610d78a 100644 --- a/module/user/js/login.js +++ b/module/user/js/login.js @@ -3,6 +3,8 @@ if(window.self !== window.top) window.top.location.href = window.location.href; $(document).ready(function() { + timeoutID = null; + /* Fix bug for misc-ping */ $('#hiddenwin').removeAttr('id'); @@ -33,10 +35,19 @@ $(document).ready(function() var link = createLink('user', 'login'); var keepLogin = $('#keepLoginon').attr('checked') == 'checked' ? 1 : 0; var captcha = $('#captcha').length == 1 ? $('#captcha').val() : ''; + var timeout = true; + + clearTimeout(timeoutID); + timeoutID = setTimeout(function() + { + if(timeout) alert(loginTimeoutTip); + }, 4000); $.get(createLink('user', 'refreshRandom'), function(data) { var rand = data; + timeout = false; + $.ajax ({ url: link, diff --git a/module/user/lang/de.php b/module/user/lang/de.php index d52a0e5dc7..33808bfb72 100644 --- a/module/user/lang/de.php +++ b/module/user/lang/de.php @@ -251,6 +251,7 @@ $lang->user->error->noEmail = 'The user does not register email. Please $lang->user->error->errorEmail = 'The account does not match the email. Please enter a new one.'; $lang->user->error->emailSetting = 'No email is configured in the system. Contact the admin to reset the email.'; $lang->user->error->sendMailFail = 'Message sending failed, please try again!'; +$lang->user->error->loginTimeoutTip = 'Login failed, please check if the proxy service is normal.'; $lang->user->contactFieldList['phone'] = $lang->user->phone; $lang->user->contactFieldList['mobile'] = $lang->user->mobile; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index f1460a4f46..0f314ec1c6 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -251,6 +251,7 @@ $lang->user->error->noEmail = 'The user does not register email. Please $lang->user->error->errorEmail = 'The account does not match the email. Please enter a new one.'; $lang->user->error->emailSetting = 'No email is configured in the system. Contact the admin to reset the email.'; $lang->user->error->sendMailFail = 'Message sending failed, please try again!'; +$lang->user->error->loginTimeoutTip = 'Login failed, please check if the proxy service is normal.'; $lang->user->contactFieldList['phone'] = $lang->user->phone; $lang->user->contactFieldList['mobile'] = $lang->user->mobile; diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php index 4df771cfe6..622a42e2b3 100644 --- a/module/user/lang/fr.php +++ b/module/user/lang/fr.php @@ -251,6 +251,7 @@ $lang->user->error->noEmail = 'The user does not register email. Please $lang->user->error->errorEmail = 'The account does not match the email. Please enter a new one.'; $lang->user->error->emailSetting = 'No email is configured in the system. Contact the admin to reset the email.'; $lang->user->error->sendMailFail = 'Message sending failed, please try again!'; +$lang->user->error->loginTimeoutTip = 'Échec de la connexion, veuillez vérifier si le service proxy est activé.'; $lang->user->contactFieldList['phone'] = $lang->user->phone; $lang->user->contactFieldList['mobile'] = $lang->user->mobile; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 74af4e7151..37cafcb434 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -251,6 +251,7 @@ $lang->user->error->noEmail = '该用户未绑定邮箱,请联系管 $lang->user->error->errorEmail = '用户名和邮箱不匹配,请重新输入。'; $lang->user->error->emailSetting = '系统未配置发信邮箱,请联系管理员重置。'; $lang->user->error->sendMailFail = '邮件发送失败,请重试!'; +$lang->user->error->loginTimeoutTip = '系统登录失败,请检查代理服务是否正常'; $lang->user->contactFieldList['phone'] = $lang->user->phone; $lang->user->contactFieldList['mobile'] = $lang->user->mobile; diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index 8490a2a58d..0530a028ad 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -11,6 +11,7 @@ include '../../common/view/header.lite.html.php'; if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js'); ?> +user->error->loginTimeoutTip);?>