diff --git a/module/user/control.php b/module/user/control.php index 4309b204b4..515415692d 100755 --- a/module/user/control.php +++ b/module/user/control.php @@ -960,6 +960,8 @@ class user extends control } else { + $loginExpired = !(preg_match("/(m=|\/)(index)(&f=|-)(index)(&|-|\.)?/", strtolower($this->referer), $output) or $this->referer == '/' or $this->referer == '/zentao/'); + $this->loadModel('misc'); $this->loadModel('extension'); $this->view->noGDLib = sprintf($this->lang->misc->noGDLib, common::getSysURL() . $this->config->webRoot, '', false, true); @@ -970,6 +972,7 @@ class user extends control $this->view->rand = $this->user->updateSessionRandom(); $this->view->unsafeSites = $this->misc->checkOneClickPackage(); $this->view->plugins = $this->extension->getExpiringPlugins(true); + $this->view->loginExpired = $loginExpired; $this->display(); } } diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 51f45c00ab..006d0a5404 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -153,6 +153,7 @@ $lang->user->loginLocked = "Please contact the administrator to unlock your acc $lang->user->weakPassword = "Your password does not meet the requirements."; $lang->user->errorWeak = "Passwords cannot use [%s] weak passwords."; $lang->user->errorCaptcha = "Captcha Error"; +$lang->user->loginExpired = 'System login has expired, please log in again :)'; $lang->user->roleList[''] = ''; $lang->user->roleList['dev'] = 'Developer'; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 5d7438a819..545330ebed 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -153,6 +153,7 @@ $lang->user->loginLocked = "密码尝试次数太多,请联系管理员解锁 $lang->user->weakPassword = "您的密码强度小于系统设定。"; $lang->user->errorWeak = "密码不能使用【%s】这些常用弱口令。"; $lang->user->errorCaptcha = "验证码不正确!"; +$lang->user->loginExpired = '系统登录已过期,请重新登录:)'; $lang->user->roleList[''] = ''; $lang->user->roleList['dev'] = '研发'; diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index 5defd8e49e..60f22957f0 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -33,6 +33,9 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
+ +

user->loginExpired;?>

+
user->account;?>