* Finish task #57893.
This commit is contained in:
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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'] = '研发';
|
||||
|
||||
@@ -33,6 +33,9 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
|
||||
<form method='post' target='hiddenwin'>
|
||||
<table class='table table-form'>
|
||||
<tbody>
|
||||
<?php if($loginExpired):?>
|
||||
<p class='text-red'><?php echo $lang->user->loginExpired;?></p>
|
||||
<?php endif;?>
|
||||
<tr>
|
||||
<th><?php echo $lang->user->account;?></th>
|
||||
<td><input class='form-control' type='text' name='account' id='account' autocomplete='off' autofocus /></td>
|
||||
|
||||
Reference in New Issue
Block a user