gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 21:16:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-02-14 11:43:17 +01:00
commit 7f1dc2dfe1
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SeedDMS_Core/Core/inc.ClassDMS.php
View File

@ -1859,8 +1859,10 @@ class SeedDMS_Core_DMS {
$role = $role->getID(); $role = $role->getID();
elseif($role == '') elseif($role == '')
$role = '0'; $role = '0';
if(trim($pwdexpiration) == '') if(trim($pwdexpiration) == '' || trim($pwdexpiration) == 'never')
$pwdexpiration = 'NULL'; $pwdexpiration = 'NULL';
elseif(trim($pwdexpiration) == 'now')
$pwdexpiration = $db->qstr(date('Y-m-d H:i:s'));
else else
$pwdexpiration = $db->qstr($pwdexpiration); $pwdexpiration = $db->qstr($pwdexpiration);
$queryStr = "INSERT INTO `tblUsers` (`login`, `pwd`, `fullName`, `email`, `language`, `theme`, `comment`, `role`, `hidden`, `disabled`, `pwdExpiration`, `quota`, `homefolder`) VALUES (".$db->qstr($login).", ".$db->qstr($pwd).", ".$db->qstr($fullName).", ".$db->qstr($email).", '".$language."', '".$theme."', ".$db->qstr($comment).", '".intval($role)."', '".intval($isHidden)."', '".intval($isDisabled)."', ".$pwdexpiration.", '".intval($quota)."', ".($homefolder ? intval($homefolder) : "NULL").")"; $queryStr = "INSERT INTO `tblUsers` (`login`, `pwd`, `fullName`, `email`, `language`, `theme`, `comment`, `role`, `hidden`, `disabled`, `pwdExpiration`, `quota`, `homefolder`) VALUES (".$db->qstr($login).", ".$db->qstr($pwd).", ".$db->qstr($fullName).", ".$db->qstr($email).", '".$language."', '".$theme."', ".$db->qstr($comment).", '".intval($role)."', '".intval($isHidden)."', '".intval($isDisabled)."', ".$pwdexpiration.", '".intval($quota)."', ".($homefolder ? intval($homefolder) : "NULL").")";

4
SeedDMS_Core/Core/inc.ClassUser.php
View File

@ -528,8 +528,10 @@ class SeedDMS_Core_User { /* {{{ */
function setPwdExpiration($newPwdExpiration) { /* {{{ */ function setPwdExpiration($newPwdExpiration) { /* {{{ */
$db = $this->_dms->getDB(); $db = $this->_dms->getDB();
if(trim($newPwdExpiration) == '') if(trim($newPwdExpiration) == '' || trim($newPwdExpiration) == 'never')
$queryStr = "UPDATE `tblUsers` SET `pwdExpiration` = NULL WHERE `id` = " . $this->_id; $queryStr = "UPDATE `tblUsers` SET `pwdExpiration` = NULL WHERE `id` = " . $this->_id;
elseif(trim($newPwdExpiration) == 'now')
$queryStr = "UPDATE `tblUsers` SET `pwdExpiration` =".$db->qstr(date('Y-m-d H:i:s'))." WHERE id = " . $this->_id;
else else
$queryStr = "UPDATE `tblUsers` SET `pwdExpiration` =".$db->qstr($newPwdExpiration)." WHERE id = " . $this->_id; $queryStr = "UPDATE `tblUsers` SET `pwdExpiration` =".$db->qstr($newPwdExpiration)." WHERE id = " . $this->_id;
$res = $db->getResult($queryStr); $res = $db->getResult($queryStr);

2
views/bootstrap/class.UsrMgr.php
View File

@ -223,7 +223,7 @@ $(document).ready( function() {
?> ?>
<tr> <tr>
<td><?php printMLText("password_expiration");?>:</td> <td><?php printMLText("password_expiration");?>:</td>
<td><select name="pwdexpiration"><?php if($currUser) { ?><option value="keep"><?php printMLText("keep");?></option><?php } ?><option value="<?php echo date('Y-m-d H:i:s'); ?>"><?php printMLText("now");?></option><option value="<?php echo date('Y-m-d H:i:s', time()+$passwordexpiration*86400); ?>"><?php printMLText("according_settings");?></option><option value=""><?php printMLText("never");?></option></select> <?php echo $currUser ? $currUser->getPwdExpiration() : ""; ?></td> <td><select name="pwdexpiration"><?php if($currUser) { ?><option value="keep"><?php printMLText("keep");?></option><?php } ?><option value="now"><?php printMLText("now");?></option><option value="<?php echo date('Y-m-d H:i:s', time()+$passwordexpiration*86400); ?>"><?php printMLText("according_settings");?></option><option value="never"><?php printMLText("never");?></option></select> <?php echo $currUser ? $currUser->getPwdExpiration() : ""; ?></td>
</tr> </tr>
<?php <?php
} }