cvs: pear /LiveUser/Perm/Storage Globals.php SQL.php

lsmith Wed Jan 19 16:31:43 2005 EDT Modified files: /pear/LiveUser/Perm/Storage Globals.php SQL.php Log: $GLOBALS['_LiveUser'] -> $GLOBALS['_LiveUser']['perm'] http://cvs.php.net/diff.php/pear/LiveUser/Perm/Storage/Globals.php?r1=1.3&r2=1.4&ty=u Index: pear/LiveUser/Perm/Storage/Globals.php diff -u pear/LiveUser/Perm/Storage/Globals.php:1.3 pear/LiveUser/Perm/Storage/Globals.php:1.4 --- pear/LiveUser/Perm/Storage/Globals.php:1.3 Tue Jan 18 16:19:22 2005 +++ pear/LiveUser/Perm/Storage/Globals.php Wed Jan 19 16:31:43 2005 @@ -16,7 +16,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -$GLOBALS['_LiveUser']['tables'] = array( +$GLOBALS['_LiveUser']['perm']['tables'] = array( 'perm_users' => array( 'fields' => array( 'perm_user_id' => 'seq', @@ -211,7 +211,7 @@ ), ); -$GLOBALS['_LiveUser']['fields'] = array( +$GLOBALS['_LiveUser']['perm']['fields'] = array( 'perm_user_id' => 'integer', 'auth_user_id' => 'text', 'auth_container_name' => 'text', @@ -239,7 +239,7 @@ 'subgroup_id' => 'integer' ); -$GLOBALS['_LiveUser']['alias'] = array( +$GLOBALS['_LiveUser']['perm']['alias'] = array( 'perm_user_id' => 'perm_user_id', 'auth_user_id' => 'auth_user_id', 'auth_container_name' => 'auth_container_name', http://cvs.php.net/diff.php/pear/LiveUser/Perm/Storage/SQL.php?r1=1.12&r2=1.13&ty=u Index: pear/LiveUser/Perm/Storage/SQL.php diff -u pear/LiveUser/Perm/Storage/SQL.php:1.12 pear/LiveUser/Perm/Storage/SQL.php:1.13 --- pear/LiveUser/Perm/Storage/SQL.php:1.12 Thu Dec 30 13:00:35 2004 +++ pear/LiveUser/Perm/Storage/SQL.php Wed Jan 19 16:31:43 2005 @@ -43,7 +43,7 @@ * * @author Lukas Smith <smith@backendmedia.com> * @author Bjoern Kraus <krausbn@php.net> - * @version $Id: SQL.php,v 1.12 2004/12/30 18:00:35 lsmith Exp $ + * @version $Id: SQL.php,v 1.13 2005/01/19 21:31:43 lsmith Exp $ * @package LiveUser * @category authentication */ @@ -107,19 +107,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); } } }