From: <lkn...@us...> - 2008-01-30 19:57:59
|
Author: lkneschke Date: Wed Jan 30 20:31:30 2008 New Revision: 714 URL: http://www.egroupware.org/viewvc?rev=3D3D714&root=3D3Dtine&view=3D3Drev Log: accept -1 as value for a non expired account too Modified: trunk/tine20/Egwbase/Auth/Sql.php Modified: trunk/tine20/Egwbase/Auth/Sql.php URL: http://www.egroupware.org/viewvc/trunk/tine20/Egwbase/Auth/Sql.php?rev= =3D =3D3D714&root=3D3Dtine&r1=3D3D713&r2=3D3D714&view=3D3Ddiff =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D= =3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D =3D3D=3D3D=3D3D --- trunk/tine20/Egwbase/Auth/Sql.php (original) +++ trunk/tine20/Egwbase/Auth/Sql.php Wed Jan 30 20:31:30 2008 @@ -50,7 +50,7 @@ return new Zend_Auth_Result($authResult['code'], $result->= =3D getIdentity(), $authResult['messages']); } =3D - if($this->_resultRow['account_expires'] !=3D3D=3D3D NULL && $t= his-=3D >_resultRow['account_expires'] < Zend_Date::now()->getTimestamp()) { + if(($this->_resultRow['account_expires'] !=3D3D=3D3D NULL && $= this=3D ->_resultRow['account_expires'] !=3D3D=3D3D -1) && $this->_resultRow['accou= nt_e=3D xpires'] < Zend_Date::now()->getTimestamp()) { // account is expired $authResult['code'] =3D3D Zend_Auth_Result::FAILURE_UNCATE= GO=3D RIZED; $authResult['messages'][] =3D3D 'Account expired.'; |