cvs: pear /LiveUser_Admin/Perm/Storage DB.php MDB.php MDB2.php

lsmith Wed Jan 19 16:31:32 2005 EDT Modified files: /pear/LiveUser_Admin/Perm/Storage DB.php MDB.php MDB2.php Log: $GLOBALS['_LiveUser'] -> $GLOBALS['_LiveUser']['perm'] http://cvs.php.net/diff.php/pear/LiveUser_Admin/Perm/Storage/DB.php?r1=1.1&r2=1.2&ty=u Index: pear/LiveUser_Admin/Perm/Storage/DB.php diff -u pear/LiveUser_Admin/Perm/Storage/DB.php:1.1 pear/LiveUser_Admin/Perm/Storage/DB.php:1.2 --- pear/LiveUser_Admin/Perm/Storage/DB.php:1.1 Thu Dec 30 13:03:23 2004 +++ pear/LiveUser_Admin/Perm/Storage/DB.php Wed Jan 19 16:31:31 2005 @@ -44,7 +44,7 @@ * * @author Lukas Smith <smith@backendmedia.com> * @author Bjoern Kraus <krausbn@php.net> - * @version $Id: DB.php,v 1.1 2004/12/30 18:03:23 lsmith Exp $ + * @version $Id: DB.php,v 1.2 2005/01/19 21:31:31 lsmith Exp $ * @package LiveUser * @category authentication */ @@ -63,19 +63,19 @@ require_once 'LiveUser/Perm/Storage/Globals.php'; if (empty($this->tables)) { - $this->tables = $GLOBALS['_LiveUser']['tables']; + $this->tables = $GLOBALS['_LiveUser']['perm']['tables']; } else { - $this->tables = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['tables'], $this->tables); + $this->tables = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['perm']['tables'], $this->tables); } if (empty($this->fields)) { - $this->fields = $GLOBALS['_LiveUser']['fields']; + $this->fields = $GLOBALS['_LiveUser']['perm']['fields']; } else { - $this->fields = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['fields'], $this->fields); + $this->fields = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['perm']['fields'], $this->fields); } if (empty($this->alias)) { - $this->alias = $GLOBALS['_LiveUser']['alias']; + $this->alias = $GLOBALS['_LiveUser']['perm']['alias']; } else { - $this->alias = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['alias'], $this->alias); + $this->alias = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['perm']['alias'], $this->alias); } } } http://cvs.php.net/diff.php/pear/LiveUser_Admin/Perm/Storage/MDB.php?r1=1.1&r2=1.2&ty=u Index: pear/LiveUser_Admin/Perm/Storage/MDB.php diff -u pear/LiveUser_Admin/Perm/Storage/MDB.php:1.1 pear/LiveUser_Admin/Perm/Storage/MDB.php:1.2 --- pear/LiveUser_Admin/Perm/Storage/MDB.php:1.1 Thu Dec 30 13:03:23 2004 +++ pear/LiveUser_Admin/Perm/Storage/MDB.php Wed Jan 19 16:31:31 2005 @@ -44,7 +44,7 @@ * * @author Lukas Smith <smith@backendmedia.com> * @author Bjoern Kraus <krausbn@php.net> - * @version $Id: MDB.php,v 1.1 2004/12/30 18:03:23 lsmith Exp $ + * @version $Id: MDB.php,v 1.2 2005/01/19 21:31:31 lsmith Exp $ * @package LiveUser * @category authentication */ @@ -63,19 +63,19 @@ require_once 'LiveUser/Perm/Storage/Globals.php'; if (empty($this->tables)) { - $this->tables = $GLOBALS['_LiveUser']['tables']; + $this->tables = $GLOBALS['_LiveUser']['perm']['tables']; } else { - $this->tables = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['tables'], $this->tables); + $this->tables = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['perm']['tables'], $this->tables); } if (empty($this->fields)) { - $this->fields = $GLOBALS['_LiveUser']['fields']; + $this->fields = $GLOBALS['_LiveUser']['perm']['fields']; } else { - $this->fields = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['fields'], $this->fields); + $this->fields = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['perm']['fields'], $this->fields); } if (empty($this->alias)) { - $this->alias = $GLOBALS['_LiveUser']['alias']; + $this->alias = $GLOBALS['_LiveUser']['perm']['alias']; } else { - $this->alias = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['alias'], $this->alias); + $this->alias = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['perm']['alias'], $this->alias); } } } http://cvs.php.net/diff.php/pear/LiveUser_Admin/Perm/Storage/MDB2.php?r1=1.16&r2=1.17&ty=u Index: pear/LiveUser_Admin/Perm/Storage/MDB2.php diff -u pear/LiveUser_Admin/Perm/Storage/MDB2.php:1.16 pear/LiveUser_Admin/Perm/Storage/MDB2.php:1.17 --- pear/LiveUser_Admin/Perm/Storage/MDB2.php:1.16 Thu Dec 30 13:00:54 2004 +++ pear/LiveUser_Admin/Perm/Storage/MDB2.php Wed Jan 19 16:31:31 2005 @@ -44,7 +44,7 @@ * * @author Lukas Smith <smith@backendmedia.com> * @author Bjoern Kraus <krausbn@php.net> - * @version $Id: MDB2.php,v 1.16 2004/12/30 18:00:54 lsmith Exp $ + * @version $Id: MDB2.php,v 1.17 2005/01/19 21:31:31 lsmith Exp $ * @package LiveUser * @category authentication */ @@ -63,19 +63,19 @@ require_once 'LiveUser/Perm/Storage/Globals.php'; if (empty($this->tables)) { - $this->tables = $GLOBALS['_LiveUser']['tables']; + $this->tables = $GLOBALS['_LiveUser']['perm']['tables']; } else { - $this->tables = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['tables'], $this->tables); + $this->tables = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['perm']['tables'], $this->tables); } if (empty($this->fields)) { - $this->fields = $GLOBALS['_LiveUser']['fields']; + $this->fields = $GLOBALS['_LiveUser']['perm']['fields']; } else { - $this->fields = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['fields'], $this->fields); + $this->fields = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['perm']['fields'], $this->fields); } if (empty($this->alias)) { - $this->alias = $GLOBALS['_LiveUser']['alias']; + $this->alias = $GLOBALS['_LiveUser']['perm']['alias']; } else { - $this->alias = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['alias'], $this->alias); + $this->alias = LiveUser::arrayMergeClobber($GLOBALS['_LiveUser']['perm']['alias'], $this->alias); } } }