cvs: pear /Perm_LiveUser/Admin/Perm/Container DB_Complex.php DB_Medium.php MDB2_Complex.php MDB2_Medium.php MDB_Complex.php MDB_Medium.php
/Perm_LiveUser/sql Auth_DB.sql auth_mdb_schema.xml perm_db.sql perm_mdb_schema.xml

lsmith Thu Mar 11 07:42:53 2004 EDT Modified files: /pear/Perm_LiveUser/sql perm_mdb_schema.xml perm_db.sql auth_mdb_schema.xml Auth_DB.sql /pear/Perm_LiveUser/Admin/Perm/Container MDB_Medium.php MDB_Complex.php MDB2_Medium.php MDB2_Complex.php DB_Medium.php DB_Complex.php Log: - renamed all instances of owner_perm_user_id to owner_user_id

http://cvs.php.net/diff.php/pear/Perm_LiveUser/sql/perm_mdb_schema.xml?r1=1.3&r2=1.4&ty=u Index: pear/Perm_LiveUser/sql/perm_mdb_schema.xml diff -u pear/Perm_LiveUser/sql/perm_mdb_schema.xml:1.3 pear/Perm_LiveUser/sql/perm_mdb_schema.xml:1.4 --- pear/Perm_LiveUser/sql/perm_mdb_schema.xml:1.3 Wed Mar 10 18:30:10 2004 +++ pear/Perm_LiveUser/sql/perm_mdb_schema.xml Thu Mar 11 07:42:52 2004 @@ -222,7 +222,7 @@ </field> <field> - <name>owner_perm_user_id</name> + <name>owner_user_id</name> <type>integer</type> <notnull>1</notnull> <default></default> @@ -259,9 +259,9 @@ </index> <index> - <name>groups_owner_perm_user_id</name> + <name>groups_owner_user_id</name> <field> - <name>owner_perm_user_id</name> + <name>owner_user_id</name> <sorting>ascending</sorting> </field> </index> http://cvs.php.net/diff.php/pear/Perm_LiveUser/sql/perm_db.sql?r1=1.4&r2=1.5&ty=u Index: pear/Perm_LiveUser/sql/perm_db.sql diff -u pear/Perm_LiveUser/sql/perm_db.sql:1.4 pear/Perm_LiveUser/sql/perm_db.sql:1.5 --- pear/Perm_LiveUser/sql/perm_db.sql:1.4 Wed Mar 10 10:21:00 2004 +++ pear/Perm_LiveUser/sql/perm_db.sql Thu Mar 11 07:42:52 2004 @@ -4,7 +4,7 @@ # -------------------------------------------------------- # Server version 4.0.12-max-debug # -# $Id: perm_db.sql,v 1.4 2004/03/10 15:21:00 lsmith Exp $ +# $Id: perm_db.sql,v 1.5 2004/03/11 12:42:52 lsmith Exp $ # # Table structure for table 'liveuser_applications' @@ -82,12 +82,12 @@ DROP TABLE IF EXISTS `liveuser_groups`; CREATE TABLE `liveuser_groups` ( `group_id` int(10) unsigned NOT NULL default '0', - `owner_perm_user_id` int(11) unsigned default NULL, + `owner_user_id` int(11) unsigned default NULL, `owner_group_id` int(11) unsigned default NULL, `is_active` char(1) NOT NULL default 'N', `group_define_name` varchar(32) NOT NULL default '', PRIMARY KEY (`group_id`), - KEY `groups_owner_perm_user_id` (`owner_perm_user_id`), + KEY `groups_owner_user_id` (`owner_user_id`), KEY `groups_owner_group_id` (`owner_group_id`) ) TYPE=MyISAM; http://cvs.php.net/diff.php/pear/Perm_LiveUser/sql/auth_mdb_schema.xml?r1=1.1&r2=1.2&ty=u Index: pear/Perm_LiveUser/sql/auth_mdb_schema.xml diff -u pear/Perm_LiveUser/sql/auth_mdb_schema.xml:1.1 pear/Perm_LiveUser/sql/auth_mdb_schema.xml:1.2 --- pear/Perm_LiveUser/sql/auth_mdb_schema.xml:1.1 Wed Mar 10 10:28:36 2004 +++ pear/Perm_LiveUser/sql/auth_mdb_schema.xml Thu Mar 11 07:42:52 2004 @@ -41,7 +41,7 @@ </field> <field> - <name><variable>owner_perm_user_id_name</variable></name> + <name><variable>owner_user_id_name</variable></name> <type>integer</type> <notnull>1</notnull> <default></default> @@ -82,9 +82,9 @@ </index> <index> - <name>users_owner_perm_user_id</name> + <name>users_owner_user_id</name> <field> - <name><variable>owner_perm_user_id_name</variable></name> + <name><variable>owner_user_id_name</variable></name> <sorting>ascending</sorting> </field> </index> http://cvs.php.net/diff.php/pear/Perm_LiveUser/sql/Auth_DB.sql?r1=1.14&r2=1.15&ty=u Index: pear/Perm_LiveUser/sql/Auth_DB.sql diff -u pear/Perm_LiveUser/sql/Auth_DB.sql:1.14 pear/Perm_LiveUser/sql/Auth_DB.sql:1.15 --- pear/Perm_LiveUser/sql/Auth_DB.sql:1.14 Wed Mar 10 10:22:35 2004 +++ pear/Perm_LiveUser/sql/Auth_DB.sql Thu Mar 11 07:42:52 2004 @@ -1,14 +1,14 @@ -# $Id: Auth_DB.sql,v 1.14 2004/03/10 15:22:35 lsmith Exp $ +# $Id: Auth_DB.sql,v 1.15 2004/03/11 12:42:52 lsmith Exp $ # LiveUser user table CREATE TABLE liveuser_users ( `auth_user_id` varchar(32) NOT NULL default '0', `handle` varchar(32) NOT NULL default '', `passwd` varchar(32) NOT NULL default '', `lastlogin` datetime default NULL, - `owner_perm_user_id` int(11) unsigned default NULL, + `owner_user_id` int(11) unsigned default NULL, `owner_group_id` int(11) unsigned default NULL, `is_active` char(1) NOT NULL default 'N', PRIMARY KEY auth_user_id (`auth_user_id`, `handle`), - KEY `users_owner_perm_user_id` (`owner_perm_user_id`), + KEY `users_owner_user_id` (`owner_user_id`), KEY `users_owner_group_id` (`owner_group_id`) ) TYPE=MyISAM; \ No newline at end of file http://cvs.php.net/diff.php/pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php?r1=1.28&r2=1.29&ty=u Index: pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php:1.28 pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php:1.29 --- pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php:1.28 Fri Mar 5 11:36:02 2004 +++ pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php Thu Mar 11 07:42:53 2004 @@ -46,7 +46,7 @@ * @author Markus Wolff <wolff@21st.de> * @author Matt Scifo <mscifo@php.net> * @author Arnaud Limbourg <arnaud@php.net> - * @version $Id: MDB_Medium.php,v 1.28 2004/03/05 16:36:02 lsmith Exp $ + * @version $Id: MDB_Medium.php,v 1.29 2004/03/11 12:42:53 lsmith Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_MDB_Medium extends LiveUser_Admin_Perm_Container_MDB_Simple @@ -453,7 +453,7 @@ { $query = 'SELECT groups.group_id AS group_id, - groups.owner_perm_user_id AS owner_user_id, + groups.owner_user_id AS owner_user_id, groups.owner_group_id AS owner_group_id, translations.name AS name, translations.description AS description, @@ -481,7 +481,7 @@ if (isset($options['where_owner_user_id']) && is_numeric($options['where_owner_user_id'])) { - $query .= ' groups.owner_perm_user_id = ' . $this->dbc->getValue('integer', $options['where_owner_user_id']) . ' AND'; + $query .= ' groups.owner_user_id = ' . $this->dbc->getValue('integer', $options['where_owner_user_id']) . ' AND'; } if (isset($options['where_owner_group_id']) http://cvs.php.net/diff.php/pear/Perm_LiveUser/Admin/Perm/Container/MDB_Complex.php?r1=1.39&r2=1.40&ty=u Index: pear/Perm_LiveUser/Admin/Perm/Container/MDB_Complex.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/MDB_Complex.php:1.39 pear/Perm_LiveUser/Admin/Perm/Container/MDB_Complex.php:1.40 --- pear/Perm_LiveUser/Admin/Perm/Container/MDB_Complex.php:1.39 Fri Mar 5 11:36:02 2004 +++ pear/Perm_LiveUser/Admin/Perm/Container/MDB_Complex.php Thu Mar 11 07:42:53 2004 @@ -45,7 +45,7 @@ * @author Christian Dickmann <dickmann@php.net> * @author Markus Wolff <wolff@21st.de> * @author Matt Scifo <mscifo@php.net> - * @version $Id: MDB_Complex.php,v 1.39 2004/03/05 16:36:02 lsmith Exp $ + * @version $Id: MDB_Complex.php,v 1.40 2004/03/11 12:42:53 lsmith Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_MDB_Complex extends LiveUser_Admin_Perm_Container_MDB_Medium @@ -71,7 +71,7 @@ * @param string name of group * @param boolean description of group * @param boolean activate group? - * @param integer owner_perm_user_id of group + * @param integer owner_user_id of group * @param integer owner_group_id of group * @return mixed integer (group_id) or MDB Error object */ @@ -87,7 +87,7 @@ // Insert Group into Groupstable $query = 'INSERT INTO ' . $this->prefix . 'groups - (group_id, group_define_name, owner_perm_user_id, owner_group_id, is_active) + (group_id, group_define_name, owner_user_id, owner_group_id, is_active) VALUES ( ' . $this->dbc->getValue('integer', $group_id) . ', @@ -255,7 +255,7 @@ * @param string name of group * @param boolean description of group * @param boolean activate group? - * @param integer owner_perm_user_id of group + * @param integer owner_user_id of group * @param integer owner_group_id of group * @return mixed boolean or MDB Error object */ @@ -265,7 +265,7 @@ $query = 'UPDATE ' . $this->prefix . 'groups SET - owner_perm_user_id = ' . $this->dbc->getValue('integer', $owner_user) . ', + owner_user_id = ' . $this->dbc->getValue('integer', $owner_user) . ', owner_group_id = ' . $this->dbc->getValue('integer', $owner_group); if ($active !== null) { $query .= ', is_active = ' . $this->dbc->getValue('boolean', $active); @@ -464,7 +464,7 @@ $query = 'SELECT groups.group_id AS group_id, - groups.owner_perm_user_id AS owner_user_id, + groups.owner_user_id AS owner_user_id, groups.owner_group_id AS owner_group_id, translations.name AS name, translations.description AS description, @@ -852,13 +852,13 @@ { parent::removeUser($permId); - // sets owner_perm_user_id to null + // sets owner_user_id to null $query = 'UPDATE ' . $this->prefix . 'groups SET - owner_perm_user_id = NULL + owner_user_id = NULL WHERE - owner_perm_user_id=' . $permId; + owner_user_id=' . $permId; $result = $this->dbc->query($query); http://cvs.php.net/diff.php/pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Medium.php?r1=1.2&r2=1.3&ty=u Index: pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Medium.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Medium.php:1.2 pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Medium.php:1.3 --- pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Medium.php:1.2 Fri Mar 5 11:36:02 2004 +++ pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Medium.php Thu Mar 11 07:42:53 2004 @@ -46,7 +46,7 @@ * @author Markus Wolff <wolff@21st.de> * @author Matt Scifo <mscifo@php.net> * @author Arnaud Limbourg <arnaud@php.net> - * @version $Id: MDB2_Medium.php,v 1.2 2004/03/05 16:36:02 lsmith Exp $ + * @version $Id: MDB2_Medium.php,v 1.3 2004/03/11 12:42:53 lsmith Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_MDB2_Medium extends LiveUser_Admin_Perm_Container_MDB2_Simple @@ -453,7 +453,7 @@ { $query = 'SELECT groups.group_id AS group_id, - groups.owner_perm_user_id AS owner_user_id, + groups.owner_user_id AS owner_user_id, groups.owner_group_id AS owner_group_id, translations.name AS name, translations.description AS description, @@ -481,7 +481,7 @@ if (isset($options['where_owner_user_id']) && is_numeric($options['where_owner_user_id'])) { - $query .= ' groups.owner_perm_user_id = ' . $this->dbc->getValue('integer', $options['where_owner_user_id']) . ' AND'; + $query .= ' groups.owner_user_id = ' . $this->dbc->getValue('integer', $options['where_owner_user_id']) . ' AND'; } if (isset($options['where_owner_group_id']) http://cvs.php.net/diff.php/pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Complex.php?r1=1.6&r2=1.7&ty=u Index: pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Complex.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Complex.php:1.6 pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Complex.php:1.7 --- pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Complex.php:1.6 Fri Mar 5 11:36:02 2004 +++ pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Complex.php Thu Mar 11 07:42:53 2004 @@ -45,7 +45,7 @@ * @author Christian Dickmann <dickmann@php.net> * @author Markus Wolff <wolff@21st.de> * @author Matt Scifo <mscifo@php.net> - * @version $Id: MDB2_Complex.php,v 1.6 2004/03/05 16:36:02 lsmith Exp $ + * @version $Id: MDB2_Complex.php,v 1.7 2004/03/11 12:42:53 lsmith Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_MDB2_Complex extends LiveUser_Admin_Perm_Container_MDB2_Medium @@ -71,7 +71,7 @@ * @param string name of group * @param boolean description of group * @param boolean activate group? - * @param integer owner_perm_user_id of group + * @param integer owner_user_id of group * @param integer owner_group_id of group * @return mixed integer (group_id) or MDB2 Error object */ @@ -87,7 +87,7 @@ // Insert Group into Groupstable $query = 'INSERT INTO ' . $this->prefix . 'groups - (group_id, group_define_name, owner_perm_user_id, owner_group_id, is_active) + (group_id, group_define_name, owner_user_id, owner_group_id, is_active) VALUES ( ' . $this->dbc->getValue('integer', $group_id) . ', @@ -255,7 +255,7 @@ * @param string name of group * @param boolean description of group * @param boolean activate group? - * @param integer owner_perm_user_id of group + * @param integer owner_user_id of group * @param integer owner_group_id of group * @return mixed boolean or MDB2 Error object */ @@ -265,7 +265,7 @@ $query = 'UPDATE ' . $this->prefix . 'groups SET - owner_perm_user_id = ' . $this->dbc->getValue('integer', $owner_user) . ', + owner_user_id = ' . $this->dbc->getValue('integer', $owner_user) . ', owner_group_id = ' . $this->dbc->getValue('integer', $owner_group); if ($active !== null) { $query .= ', is_active = ' . $this->dbc->getValue('boolean', $active); @@ -464,7 +464,7 @@ $query = 'SELECT groups.group_id AS group_id, - groups.owner_perm_user_id AS owner_user_id, + groups.owner_user_id AS owner_user_id, groups.owner_group_id AS owner_group_id, translations.name AS name, translations.description AS description, @@ -852,13 +852,13 @@ { parent::removeUser($permId); - // sets owner_perm_user_id to null + // sets owner_user_id to null $query = 'UPDATE ' . $this->prefix . 'groups SET - owner_perm_user_id = NULL + owner_user_id = NULL WHERE - owner_perm_user_id=' . $permId; + owner_user_id=' . $permId; $result = $this->dbc->query($query); http://cvs.php.net/diff.php/pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php?r1=1.36&r2=1.37&ty=u Index: pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php:1.36 pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php:1.37 --- pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php:1.36 Fri Mar 5 11:36:02 2004 +++ pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php Thu Mar 11 07:42:53 2004 @@ -46,7 +46,7 @@ * @author Markus Wolff <wolff@21st.de> * @author Matt Scifo <mscifo@php.net> * @author Arnaud Limbourg <arnaud@php.net> - * @version $Id: DB_Medium.php,v 1.36 2004/03/05 16:36:02 lsmith Exp $ + * @version $Id: DB_Medium.php,v 1.37 2004/03/11 12:42:53 lsmith Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_DB_Medium extends LiveUser_Admin_Perm_Container_DB_Simple @@ -453,7 +453,7 @@ { $query = 'SELECT groups.group_id AS group_id, - groups.owner_perm_user_id AS owner_user_id, + groups.owner_user_id AS owner_user_id, groups.owner_group_id AS owner_group_id, translations.name AS name, translations.description AS description, @@ -481,7 +481,7 @@ if (isset($options['where_owner_user_id']) && is_numeric($options['where_owner_user_id'])) { - $query .= ' groups.owner_perm_user_id = ' . (int)$options['where_owner_user_id'] . ' AND'; + $query .= ' groups.owner_user_id = ' . (int)$options['where_owner_user_id'] . ' AND'; } if (isset($options['where_owner_group_id']) http://cvs.php.net/diff.php/pear/Perm_LiveUser/Admin/Perm/Container/DB_Complex.php?r1=1.50&r2=1.51&ty=u Index: pear/Perm_LiveUser/Admin/Perm/Container/DB_Complex.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/DB_Complex.php:1.50 pear/Perm_LiveUser/Admin/Perm/Container/DB_Complex.php:1.51 --- pear/Perm_LiveUser/Admin/Perm/Container/DB_Complex.php:1.50 Fri Mar 5 11:36:02 2004 +++ pear/Perm_LiveUser/Admin/Perm/Container/DB_Complex.php Thu Mar 11 07:42:53 2004 @@ -45,7 +45,7 @@ * @author Christian Dickmann <dickmann@php.net> * @author Markus Wolff <wolff@21st.de> * @author Matt Scifo <mscifo@php.net> - * @version $Id: DB_Complex.php,v 1.50 2004/03/05 16:36:02 lsmith Exp $ + * @version $Id: DB_Complex.php,v 1.51 2004/03/11 12:42:53 lsmith Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_DB_Complex extends LiveUser_Admin_Perm_Container_DB_Medium @@ -71,7 +71,7 @@ * @param string name of group * @param boolean description of group * @param boolean activate group? - * @param integer owner_perm_user_id of group + * @param integer owner_user_id of group * @param integer owner_group_id of group * @return mixed integer (group_id) or DB Error object */ @@ -87,7 +87,7 @@ // Insert Group into Groupstable $query = 'INSERT INTO ' . $this->prefix . 'groups - (group_id, group_define_name, owner_perm_user_id, owner_group_id, is_active) + (group_id, group_define_name, owner_user_id, owner_group_id, is_active) VALUES ( ' . (int)$group_id . ', @@ -255,7 +255,7 @@ * @param string name of group * @param boolean description of group * @param boolean activate group? - * @param integer owner_perm_user_id of group + * @param integer owner_user_id of group * @param integer owner_group_id of group * @return mixed boolean or DB Error object */ @@ -265,7 +265,7 @@ $query = 'UPDATE ' . $this->prefix . 'groups SET - owner_perm_user_id = ' . (($owner_user !== null) ? (int)$owner_user : 'NULL') . ', + owner_user_id = ' . (($owner_user !== null) ? (int)$owner_user : 'NULL') . ', owner_group_id = ' . (($owner_group !== null) ? (int)$owner_group : 'NULL'); if ($active !== null) { $query .= ', is_active = ' . ($active ? '\'Y\'' : '\'N\''); @@ -464,7 +464,7 @@ $query = 'SELECT groups.group_id AS group_id, - groups.owner_perm_user_id AS owner_user_id, + groups.owner_user_id AS owner_user_id, groups.owner_group_id AS owner_group_id, translations.name AS name, translations.description AS description, @@ -852,13 +852,13 @@ { parent::removeUser($permId); - // sets owner_perm_user_id to null + // sets owner_user_id to null $query = 'UPDATE ' . $this->prefix . 'groups SET - owner_perm_user_id = NULL + owner_user_id = NULL WHERE - owner_perm_user_id=' . $permId; + owner_user_id=' . $permId; $result = $this->dbc->query($query);