cvs: pear /LiveUser/Auth DB.php MDB.php MDB2.php XML.php
| From: | Lukas Smith | Date: | Mon, 18 Jul 2005 16:16:56 +0000 |
| Subject: | cvs: pear /LiveUser/Auth DB.php MDB.php MDB2.php XML.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-33123@lists.php.net to get a copy of this message | ||
lsmith Mon Jul 18 12:16:56 2005 EDT
Modified files:
/pear/LiveUser/Auth DB.php MDB.php MDB2.php XML.php
Log:
- cleaned up lastlogin handling (bug #4843)
http://cvs.php.net/diff.php/pear/LiveUser/Auth/DB.php?r1=1.17&r2=1.18&ty=u
Index: pear/LiveUser/Auth/DB.php
diff -u pear/LiveUser/Auth/DB.php:1.17 pear/LiveUser/Auth/DB.php:1.18
--- pear/LiveUser/Auth/DB.php:1.17 Tue Jun 7 10:41:17 2005
+++ pear/LiveUser/Auth/DB.php Mon Jul 18 12:16:56 2005
@@ -40,7 +40,7 @@
* @author Bjoern Kraus <krausbn@php.net>
* @copyright 2002-2005 Markus Wolff
* @license http://www.gnu.org/licenses/lgpl.txt
- * @version CVS: $Id: DB.php,v 1.17 2005/06/07 14:41:17 lsmith Exp $
+ * @version CVS: $Id: DB.php,v 1.18 2005/07/18 16:16:56 lsmith Exp $
* @link http://pear.php.net/LiveUser
*/
@@ -244,7 +244,8 @@
if (isset($result['is_active'])) {
unset($result['is_active']);
}
- $this->lastLogin = isset($result['lastlogin']) ?
strtotime($result['lastlogin']) : '';
+ $this->lastLogin = (isset($result['lastlogin']) &&
!empty($result['lastlogin']))
+ ? strtotime($result['lastlogin']) : '';
if (isset($result['lastlogin'])) {
unset($result['lastlogin']);
}
http://cvs.php.net/diff.php/pear/LiveUser/Auth/MDB.php?r1=1.19&r2=1.20&ty=u
Index: pear/LiveUser/Auth/MDB.php
diff -u pear/LiveUser/Auth/MDB.php:1.19 pear/LiveUser/Auth/MDB.php:1.20
--- pear/LiveUser/Auth/MDB.php:1.19 Fri Jun 17 08:59:45 2005
+++ pear/LiveUser/Auth/MDB.php Mon Jul 18 12:16:56 2005
@@ -40,7 +40,7 @@
* @author Bjoern Kraus <krausbn@php.net>
* @copyright 2002-2005 Markus Wolff
* @license http://www.gnu.org/licenses/lgpl.txt
- * @version CVS: $Id: MDB.php,v 1.19 2005/06/17 12:59:45 lsmith Exp $
+ * @version CVS: $Id: MDB.php,v 1.20 2005/07/18 16:16:56 lsmith Exp $
* @link http://pear.php.net/LiveUser
*/
@@ -254,7 +254,8 @@
if (isset($result['is_active'])) {
unset($result['is_active']);
}
- $this->lastLogin = isset($result['lastlogin']) ?
MDB_Date::mdbstamp2Unix($result['lastlogin']) : '';
+ $this->lastLogin = (isset($result['lastlogin']) &&
!empty($result['lastlogin']))
+ ? MDB_Date::mdbstamp2Unix($result['lastlogin']) : '';
if (isset($result['lastlogin'])) {
unset($result['lastlogin']);
}
http://cvs.php.net/diff.php/pear/LiveUser/Auth/MDB2.php?r1=1.19&r2=1.20&ty=u
Index: pear/LiveUser/Auth/MDB2.php
diff -u pear/LiveUser/Auth/MDB2.php:1.19 pear/LiveUser/Auth/MDB2.php:1.20
--- pear/LiveUser/Auth/MDB2.php:1.19 Fri Jun 17 08:59:45 2005
+++ pear/LiveUser/Auth/MDB2.php Mon Jul 18 12:16:56 2005
@@ -40,7 +40,7 @@
* @author Bjoern Kraus <krausbn@php.net>
* @copyright 2002-2005 Markus Wolff
* @license http://www.gnu.org/licenses/lgpl.txt
- * @version CVS: $Id: MDB2.php,v 1.19 2005/06/17 12:59:45 lsmith Exp $
+ * @version CVS: $Id: MDB2.php,v 1.20 2005/07/18 16:16:56 lsmith Exp $
* @link http://pear.php.net/LiveUser
*/
@@ -255,7 +255,8 @@
if (isset($result['is_active'])) {
unset($result['is_active']);
}
- $this->lastLogin = isset($result['lastlogin']) ?
MDB2_Date::mdbstamp2Unix($result['lastlogin']) : '';
+ $this->lastLogin = (isset($result['lastlogin']) &&
!empty($result['lastlogin']))
+ ? MDB2_Date::mdbstamp2Unix($result['lastlogin']) : '';
if (isset($result['lastlogin'])) {
unset($result['lastlogin']);
}
http://cvs.php.net/diff.php/pear/LiveUser/Auth/XML.php?r1=1.19&r2=1.20&ty=u
Index: pear/LiveUser/Auth/XML.php
diff -u pear/LiveUser/Auth/XML.php:1.19 pear/LiveUser/Auth/XML.php:1.20
--- pear/LiveUser/Auth/XML.php:1.19 Tue Jun 7 10:41:17 2005
+++ pear/LiveUser/Auth/XML.php Mon Jul 18 12:16:56 2005
@@ -40,7 +40,7 @@
* @author Bjoern Kraus <krausbn@php.net>
* @copyright 2002-2005 Markus Wolff
* @license http://www.gnu.org/licenses/lgpl.txt
- * @version CVS: $Id: XML.php,v 1.19 2005/06/07 14:41:17 lsmith Exp $
+ * @version CVS: $Id: XML.php,v 1.20 2005/07/18 16:16:56 lsmith Exp $
* @link http://pear.php.net/LiveUser
*/
@@ -265,7 +265,8 @@
if (isset($result['is_active'])) {
unset($result['is_active']);
}
- $this->lastLogin = isset($result['lastlogin']) ?
$result['lastlogin'] : '';
+ $this->lastLogin = (isset($result['lastlogin']) &&
!empty($result['lastlogin']))
+ ? $result['lastlogin'] : '';
if (isset($result['lastlogin'])) {
unset($result['lastlogin']);
}