gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-18 02:59:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not use '0000-00-00 00:00:00' as date anymore

Browse Source 
use NULL instead because '0000-00-00 00:00:00' in certain sql_modes
This commit is contained in:
Uwe Steinmann 2016-08-08 12:49:59 +02:00
parent b3ec207213
commit 83dcd9da7b
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1639,8 +1639,10 @@ class SeedDMS_Core_DMS {
elseif($role == '')
$role = '0';
if(trim($pwdexpiration) == '')
$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)."', ".($homefolder ? intval($homefolder) : "NULL").")";
$pwdexpiration = 'NULL';
else
$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").")";
$res = $this->db->getResult($queryStr);
if (!$res)
return false;

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

@ -79,7 +79,7 @@ class SeedDMS_Core_Transmittal {
*/
var $_dms;
function SeedDMS_Core_Transmittal($id, $user, $name, $comment, $isPublic=0, $date='0000-00-00 00:00:00') {
function SeedDMS_Core_Transmittal($id, $user, $name, $comment, $isPublic=0, $date='') {
$this->_id = $id;
$this->_name = $name;
$this->_comment = $comment;
@ -312,7 +312,7 @@ class SeedDMS_Core_TransmittalItem {
*/
var $_date;
function SeedDMS_Core_TransmittalItem($id, $transmittal, $content, $date='0000-00-00 00:00:00') {
function SeedDMS_Core_TransmittalItem($id, $transmittal, $content, $date='') {
$this->_id = $id;
$this->_transmittal = $transmittal;
$this->_content = $content;

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

@ -372,7 +372,7 @@ class SeedDMS_Core_User { /* {{{ */
const role_admin = '1';
const role_guest = '2';
function __construct($id, $login, $pwd, $fullName, $email, $language, $theme, $comment, $role, $isHidden=0, $isDisabled=0, $pwdExpiration='0000-00-00 00:00:00', $loginFailures=0, $quota=0, $homeFolder=null, $secret='') {
function __construct($id, $login, $pwd, $fullName, $email, $language, $theme, $comment, $role, $isHidden=0, $isDisabled=0, $pwdExpiration='', $loginFailures=0, $quota=0, $homeFolder=null, $secret='') {
$this->_id = $id;
$this->_login = $login;
$this->_pwd = $pwd;
@ -529,8 +529,9 @@ class SeedDMS_Core_User { /* {{{ */
$db = $this->_dms->getDB();
if(trim($newPwdExpiration) == '')
$newPwdExpiration = '0000-00-00 00:00:00';
$queryStr = "UPDATE tblUsers SET pwdExpiration =".$db->qstr($newPwdExpiration)." WHERE id = " . $this->_id;
$queryStr = "UPDATE tblUsers SET pwdExpiration = NULL WHERE id = " . $this->_id;
else
$queryStr = "UPDATE tblUsers SET pwdExpiration =".$db->qstr($newPwdExpiration)." WHERE id = " . $this->_id;
$res = $db->getResult($queryStr);
if (!$res)
return false;