mirror of
https://git.code.sf.net/p/seeddms/code
synced 2026-01-13 12:57:59 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
fcb8952dd2
|
|
@ -358,10 +358,7 @@ else if ($action == "edituser") {
|
|||
|
||||
$login = $_POST["login"];
|
||||
$pwd = $_POST["pwd"];
|
||||
if(isset($_POST['clearpwd']) && $_POST['clearpwd'])
|
||||
$clearpwd = 1;
|
||||
else
|
||||
$clearpwd = 0;
|
||||
$clearpwd = (isset($_POST['clearpwd']) && $_POST['clearpwd']) ? true : false;
|
||||
if(isset($_POST["pwdexpiration"]))
|
||||
$pwdexpiration = $_POST["pwdexpiration"];
|
||||
else
|
||||
|
|
|
|||
|
|
@ -290,9 +290,30 @@ $(document).ready( function() {
|
|||
'value'=>($currUser ? htmlspecialchars($currUser->getLogin()) : '')
|
||||
)
|
||||
);
|
||||
if ($currUser && $currUser->isGuest()) {
|
||||
$this->formField(
|
||||
getMLText("clear_password"),
|
||||
array(
|
||||
'element'=>'input',
|
||||
'type'=>'checkbox',
|
||||
'name'=>'clearpwd',
|
||||
'value'=>1,
|
||||
)
|
||||
);
|
||||
}
|
||||
$this->formField(
|
||||
getMLText("password"),
|
||||
'<input type="password" class="pwd form-control" rel="strengthbar'.($currUser ? $currUser->getID() : "0").'" name="pwd" id="pwd">'.(($currUser && $currUser->isGuest()) ? ' <input type="checkbox" name="clearpwd" value="1" /> '.getMLText('clear_password') : '')
|
||||
array(
|
||||
'element'=>'input',
|
||||
'type'=>'password',
|
||||
'id'=>'pwd',
|
||||
'name'=>'pwd',
|
||||
'class'=>'pwd',
|
||||
'autocomplete'=>'off',
|
||||
'required'=>true,
|
||||
'attributes'=>[['rel', 'strengthbar'.($currUser ? $currUser->getID() : "0")]],
|
||||
'addon'=>'<i class="fa fa-eye-slash"></i>'
|
||||
)
|
||||
);
|
||||
if($passwordstrength > 0) {
|
||||
$this->formField(
|
||||
|
|
@ -307,6 +328,8 @@ $(document).ready( function() {
|
|||
'type'=>'password',
|
||||
'id'=>'pwdconf',
|
||||
'name'=>'pwdconf',
|
||||
'autocomplete'=>'off',
|
||||
'addon'=>'<i class="fa fa-eye-slash"></i>'
|
||||
)
|
||||
);
|
||||
if($passwordexpiration > 0 && (!$currUser || !$currUser->isAdmin())) {
|
||||
|
|
@ -673,4 +696,3 @@ $(document).ready( function() {
|
|||
$this->htmlEndPage();
|
||||
} /* }}} */
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user