set homefolder to NULL if not set

This commit is contained in:
Uwe Steinmann 2015-09-21 12:51:37 +02:00
parent 8ab6dda490
commit b6012ae428
2 changed files with 3 additions and 3 deletions

View File

@ -1266,7 +1266,7 @@ class SeedDMS_Core_DMS {
* @param integer $isDisabled disable user and prevent login * @param integer $isDisabled disable user and prevent login
* @return object of {@link SeedDMS_Core_User} * @return object of {@link SeedDMS_Core_User}
*/ */
function addUser($login, $pwd, $fullName, $email, $language, $theme, $comment, $role='0', $isHidden=0, $isDisabled=0, $pwdexpiration='', $quota=0, $homefolder=0) { /* {{{ */ function addUser($login, $pwd, $fullName, $email, $language, $theme, $comment, $role='0', $isHidden=0, $isDisabled=0, $pwdexpiration='', $quota=0, $homefolder=null) { /* {{{ */
$db = $this->db; $db = $this->db;
if (is_object($this->getUserByLogin($login))) { if (is_object($this->getUserByLogin($login))) {
return false; return false;
@ -1275,7 +1275,7 @@ class SeedDMS_Core_DMS {
$role = '0'; $role = '0';
if(trim($pwdexpiration) == '') if(trim($pwdexpiration) == '')
$pwdexpiration = '0000-00-00 00:00:00'; $pwdexpiration = '0000-00-00 00:00:00';
$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)."', ".$db->qstr($pwdexpiration).", '".intval($quota)."', '".intval($homefolder)."')"; $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)."', ".$db->qstr($pwdexpiration).", '".intval($quota)."', ".($homefolder ? intval($homefolder) : NULL).")";
$res = $this->db->getResult($queryStr); $res = $this->db->getResult($queryStr);
if (!$res) if (!$res)
return false; return false;

View File

@ -462,7 +462,7 @@ class SeedDMS_Core_User { /* {{{ */
function setHomeFolder($homefolder) { /* {{{ */ function setHomeFolder($homefolder) { /* {{{ */
$db = $this->_dms->getDB(); $db = $this->_dms->getDB();
$queryStr = "UPDATE tblUsers SET homefolder = " . (int) $homefolder . " WHERE id = " . $this->_id; $queryStr = "UPDATE tblUsers SET homefolder = " . ($homefolder ? (int) $homefolder : NULL) . " WHERE id = " . $this->_id;
if (!$db->getResult($queryStr)) if (!$db->getResult($queryStr))
return false; return false;