cvs: pear /Perm_LiveUser LiveUser.php /Perm_LiveUser/Admin/Perm/Container DB_Medium.php MDB_Medium.php /Perm_LiveUser/Auth/Container DB.php MDB.php
/Perm_LiveUser/examples/example3 demodata.sql /Perm_LiveUser/sql Perm_DB_Complex.sql
| From: | Arnaud Limbourg | Date: | Thu, 25 Sep 2003 19:11:50 +0000 |
| Subject: | cvs: pear /Perm_LiveUser LiveUser.php /Perm_LiveUser/Admin/Perm/Container DB_Medium.php MDB_Medium.php /Perm_LiveUser/Auth/Container DB.php MDB.php /Perm_LiveUser/examples/example3 demodata.sql /Perm_LiveUser/sql Perm_DB_Complex.sql |
||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-13091@lists.php.net to get a copy of this message | ||
arnaud Thu Sep 25 15:11:50 2003 EDT
Modified files:
/pear/Perm_LiveUser LiveUser.php
/pear/Perm_LiveUser/Admin/Perm/Container DB_Medium.php
MDB_Medium.php
/pear/Perm_LiveUser/Auth/Container DB.php MDB.php
/pear/Perm_LiveUser/examples/example3 demodata.sql
/pear/Perm_LiveUser/sql Perm_DB_Complex.sql
Log:
* lasts instances of password changed to passwd
* sql files updated
Index: pear/Perm_LiveUser/LiveUser.php diff -u pear/Perm_LiveUser/LiveUser.php:1.39 pear/Perm_LiveUser/LiveUser.php:1.40 --- pear/Perm_LiveUser/LiveUser.php:1.39 Sun Sep 21 11:37:51 2003 +++ pear/Perm_LiveUser/LiveUser.php Thu Sep 25 15:11:46 2003 @@ -91,7 +91,7 @@ * @author Lukas Smith <smith@backendmedia.com> * @author Pierre-Alain Joye <pajoye@php.net> * @author Arnaud Limbourg <arnaud@php.net> - * @version $Id: LiveUser.php,v 1.39 2003/09/21 15:37:51 arnaud Exp $ + * @version $Id: LiveUser.php,v 1.40 2003/09/25 19:11:46 arnaud Exp $ * @package LiveUser */ class LiveUser @@ -723,7 +723,7 @@ } /** - * Calls the container objects´ freeze methods which should close + * Calls the container objects freeze methods which should close * their database connections. After that, the container objects are * being serialized and stored in the session. * @@ -753,7 +753,7 @@ /** * If cookies are allowed, this method checks if the user wanted - * a cookie to be set so he doesn´t have to enter handle and password + * a cookie to be set so he doesn't have to enter handle and password * for his next login. If true, it will set the cookie. * * @access private @@ -1117,7 +1117,7 @@ * If no rights are available, FALSE is returned. * * @access public - * @param boolean Return array with right_id´s as key and level as value + * @param boolean Return array with right_id?s as key and level as value * @return mixed an array of rights or false */ function getRights($withLevels = false) Index: pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php:1.12 pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php:1.13 --- pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php:1.12 Fri Sep 19 10:24:53 2003 +++ pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php Thu Sep 25 15:11:47 2003 @@ -47,7 +47,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.12 2003/09/19 14:24:53 arnaud Exp $ + * @version $Id: DB_Medium.php,v 1.13 2003/09/25 19:11:47 arnaud Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_DB_Medium extends LiveUser_Admin_Perm_DB_Common @@ -429,7 +429,7 @@ { $query = 'SELECT groups.group_id as group_id, - groups.owner_user_id as owner_user_id, + groups.owner_perm_user_id as owner_user_id, groups.owner_group_id as owner_group_id, translations.name as name, translations.comment as comment, @@ -457,7 +457,7 @@ if (isset($options['where_owner_user_id']) && is_numeric($options['where_owner_user_id'])) { - $query .= ' groups.owner_user_id = ' . (int)$options['where_owner_user_id'] . ' AND'; + $query .= ' groups.owner_perm_user_id = ' . (int)$options['where_owner_user_id'] . ' AND'; } if (isset($options['where_owner_group_id']) Index: pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php:1.5 pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php:1.6 --- pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php:1.5 Fri Sep 19 10:24:53 2003 +++ pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php Thu Sep 25 15:11:47 2003 @@ -1,4 +1,3 @@ - <?php // LiveUser: A framework for authentication and authorization in PHP applications // Copyright (C) 2002-2003 Markus Wolff @@ -48,7 +47,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.5 2003/09/19 14:24:53 arnaud Exp $ + * @version $Id: MDB_Medium.php,v 1.6 2003/09/25 19:11:47 arnaud Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_MDB_Medium extends LiveUser_Admin_Perm_MDB_Common @@ -400,7 +399,7 @@ { $query = 'SELECT groups.group_id as group_id, - groups.owner_user_id as owner_user_id, + groups.owner_perm_user_id as owner_user_id, groups.owner_group_id as owner_group_id, translations.name as name, translations.comment as comment, @@ -428,7 +427,7 @@ if (isset($options['where_owner_user_id']) && is_numeric($options['where_owner_user_id'])) { - $query .= ' groups.owner_user_id = ' . $this->dbc->getIntegerValue($options['where_owner_user_id']) . ' AND'; + $query .= ' groups.owner_perm_user_id = ' . $this->dbc->getIntegerValue($options['where_owner_user_id']) . ' AND'; } if (isset($options['where_owner_group_id']) Index: pear/Perm_LiveUser/Auth/Container/DB.php diff -u pear/Perm_LiveUser/Auth/Container/DB.php:1.29 pear/Perm_LiveUser/Auth/Container/DB.php:1.30 --- pear/Perm_LiveUser/Auth/Container/DB.php:1.29 Fri Sep 12 08:57:10 2003 +++ pear/Perm_LiveUser/Auth/Container/DB.php Thu Sep 25 15:11:48 2003 @@ -47,7 +47,7 @@ * 'allowDuplicateHandles' => 1); * * @author Markus Wolff <wolff@21st.de> - * @version $Id: DB.php,v 1.29 2003/09/12 12:57:10 lsmith Exp $ + * @version $Id: DB.php,v 1.30 2003/09/25 19:11:48 arnaud Exp $ * @package LiveUser * @category authentication */ @@ -89,7 +89,7 @@ */ var $authTableCols = array('userId' => 'auth_user_id', 'handle' => 'handle', - 'password' => 'password', + 'password' => 'passwd', 'lastLogin' => 'lastlogin', 'isActive' => 'is_active'); Index: pear/Perm_LiveUser/Auth/Container/MDB.php diff -u pear/Perm_LiveUser/Auth/Container/MDB.php:1.13 pear/Perm_LiveUser/Auth/Container/MDB.php:1.14 --- pear/Perm_LiveUser/Auth/Container/MDB.php:1.13 Fri Sep 12 08:57:10 2003 +++ pear/Perm_LiveUser/Auth/Container/MDB.php Thu Sep 25 15:11:48 2003 @@ -48,7 +48,7 @@ * 'allowDuplicateHandles' => 1); * * @author Markus Wolff <wolff@21st.de> - * @version $Id: MDB.php,v 1.13 2003/09/12 12:57:10 lsmith Exp $ + * @version $Id: MDB.php,v 1.14 2003/09/25 19:11:48 arnaud Exp $ * @package LiveUser * @category authentication */ @@ -90,7 +90,7 @@ */ var $authTableCols = array('userId' => array('name' => 'auth_user_id', 'type' => 'text'), 'handle' => array('name' => 'handle', 'type' => 'text'), - 'password' => array('name' => 'password', 'type' => 'text'), + 'password' => array('name' => 'passwd', 'type' => 'text'), 'lastLogin' => array('name' => 'lastlogin', 'type' => 'timestamp'), 'isActive' => array('name' => 'is_active', 'type' => 'boolean')); Index: pear/Perm_LiveUser/examples/example3/demodata.sql diff -u pear/Perm_LiveUser/examples/example3/demodata.sql:1.6 pear/Perm_LiveUser/examples/example3/demodata.sql:1.7 --- pear/Perm_LiveUser/examples/example3/demodata.sql:1.6 Fri Sep 12 08:57:17 2003 +++ pear/Perm_LiveUser/examples/example3/demodata.sql Thu Sep 25 15:11:49 2003 @@ -1,11 +1,11 @@ -# $Id: demodata.sql,v 1.6 2003/09/12 12:57:17 lsmith Exp $ +# $Id: demodata.sql,v 1.7 2003/09/25 19:11:49 arnaud Exp $ # Creating tables ... CREATE TABLE liveuser_users ( auth_user_id varchar(32) NOT NULL default '0', handle varchar(32) NOT NULL default '', -password varchar(32) NOT NULL default '', +passwd varchar(32) NOT NULL default '', lastlogin datetime default NULL, owner_user_id bigint UNSIGNED default NULL, owner_group_id int(11) UNSIGNED default NULL, @@ -295,8 +295,8 @@ INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (1, 1, 'Lesen', 'Der Benutzer darf etwas lesen.'); INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (2, 1, 'Schreiben', 'Der Benutzer darf etwas schreiben.'); -INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (3, 1, 'Zugangang', '"Sesam öffne dich"-Recht'); -INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (4, 1, 'Feuer', 'Atombombe zünden'); +INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (3, 1, 'Zugangang', '"Sesam ?ffne dich"-Recht'); +INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (4, 1, 'Feuer', 'Atombombe z?nden'); INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (5, 1, 'Lift up', 'Alien Raumschiff fliegen'); INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (6, 1, 'Kaffee machen', 'Kaffeepulver, Wasser, einschalten, warten ...'); INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (7, 1, 'Kaffee trinken', 'Ahh, Koffein'); Index: pear/Perm_LiveUser/sql/Perm_DB_Complex.sql diff -u pear/Perm_LiveUser/sql/Perm_DB_Complex.sql:1.15 pear/Perm_LiveUser/sql/Perm_DB_Complex.sql:1.16 --- pear/Perm_LiveUser/sql/Perm_DB_Complex.sql:1.15 Wed Sep 17 13:37:24 2003 +++ pear/Perm_LiveUser/sql/Perm_DB_Complex.sql Thu Sep 25 15:11:50 2003 @@ -125,7 +125,7 @@ CREATE TABLE `liveuser_languages` ( `language_id` smallint(5) unsigned NOT NULL default '0', `two_letter_name` char(2) default 'NU', - `native_name` varchar(50) default 'NULL', + `native_name` varchar(50) default NULL, PRIMARY KEY (`language_id`) ) TYPE=MyISAM;
Index: pear/Perm_LiveUser/LiveUser.php diff -u pear/Perm_LiveUser/LiveUser.php:1.39 pear/Perm_LiveUser/LiveUser.php:1.40 --- pear/Perm_LiveUser/LiveUser.php:1.39 Sun Sep 21 11:37:51 2003 +++ pear/Perm_LiveUser/LiveUser.php Thu Sep 25 15:11:46 2003 @@ -91,7 +91,7 @@ * @author Lukas Smith <smith@backendmedia.com> * @author Pierre-Alain Joye <pajoye@php.net> * @author Arnaud Limbourg <arnaud@php.net> - * @version $Id: LiveUser.php,v 1.39 2003/09/21 15:37:51 arnaud Exp $ + * @version $Id: LiveUser.php,v 1.40 2003/09/25 19:11:46 arnaud Exp $ * @package LiveUser */ class LiveUser @@ -723,7 +723,7 @@ } /** - * Calls the container objects´ freeze methods which should close + * Calls the container objects freeze methods which should close * their database connections. After that, the container objects are * being serialized and stored in the session. * @@ -753,7 +753,7 @@ /** * If cookies are allowed, this method checks if the user wanted - * a cookie to be set so he doesn´t have to enter handle and password + * a cookie to be set so he doesn't have to enter handle and password * for his next login. If true, it will set the cookie. * * @access private @@ -1117,7 +1117,7 @@ * If no rights are available, FALSE is returned. * * @access public - * @param boolean Return array with right_id´s as key and level as value + * @param boolean Return array with right_id?s as key and level as value * @return mixed an array of rights or false */ function getRights($withLevels = false) Index: pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php:1.12 pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php:1.13 --- pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php:1.12 Fri Sep 19 10:24:53 2003 +++ pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php Thu Sep 25 15:11:47 2003 @@ -47,7 +47,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.12 2003/09/19 14:24:53 arnaud Exp $ + * @version $Id: DB_Medium.php,v 1.13 2003/09/25 19:11:47 arnaud Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_DB_Medium extends LiveUser_Admin_Perm_DB_Common @@ -429,7 +429,7 @@ { $query = 'SELECT groups.group_id as group_id, - groups.owner_user_id as owner_user_id, + groups.owner_perm_user_id as owner_user_id, groups.owner_group_id as owner_group_id, translations.name as name, translations.comment as comment, @@ -457,7 +457,7 @@ if (isset($options['where_owner_user_id']) && is_numeric($options['where_owner_user_id'])) { - $query .= ' groups.owner_user_id = ' . (int)$options['where_owner_user_id'] . ' AND'; + $query .= ' groups.owner_perm_user_id = ' . (int)$options['where_owner_user_id'] . ' AND'; } if (isset($options['where_owner_group_id']) Index: pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php:1.5 pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php:1.6 --- pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php:1.5 Fri Sep 19 10:24:53 2003 +++ pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php Thu Sep 25 15:11:47 2003 @@ -1,4 +1,3 @@ - <?php // LiveUser: A framework for authentication and authorization in PHP applications // Copyright (C) 2002-2003 Markus Wolff @@ -48,7 +47,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.5 2003/09/19 14:24:53 arnaud Exp $ + * @version $Id: MDB_Medium.php,v 1.6 2003/09/25 19:11:47 arnaud Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_MDB_Medium extends LiveUser_Admin_Perm_MDB_Common @@ -400,7 +399,7 @@ { $query = 'SELECT groups.group_id as group_id, - groups.owner_user_id as owner_user_id, + groups.owner_perm_user_id as owner_user_id, groups.owner_group_id as owner_group_id, translations.name as name, translations.comment as comment, @@ -428,7 +427,7 @@ if (isset($options['where_owner_user_id']) && is_numeric($options['where_owner_user_id'])) { - $query .= ' groups.owner_user_id = ' . $this->dbc->getIntegerValue($options['where_owner_user_id']) . ' AND'; + $query .= ' groups.owner_perm_user_id = ' . $this->dbc->getIntegerValue($options['where_owner_user_id']) . ' AND'; } if (isset($options['where_owner_group_id']) Index: pear/Perm_LiveUser/Auth/Container/DB.php diff -u pear/Perm_LiveUser/Auth/Container/DB.php:1.29 pear/Perm_LiveUser/Auth/Container/DB.php:1.30 --- pear/Perm_LiveUser/Auth/Container/DB.php:1.29 Fri Sep 12 08:57:10 2003 +++ pear/Perm_LiveUser/Auth/Container/DB.php Thu Sep 25 15:11:48 2003 @@ -47,7 +47,7 @@ * 'allowDuplicateHandles' => 1); * * @author Markus Wolff <wolff@21st.de> - * @version $Id: DB.php,v 1.29 2003/09/12 12:57:10 lsmith Exp $ + * @version $Id: DB.php,v 1.30 2003/09/25 19:11:48 arnaud Exp $ * @package LiveUser * @category authentication */ @@ -89,7 +89,7 @@ */ var $authTableCols = array('userId' => 'auth_user_id', 'handle' => 'handle', - 'password' => 'password', + 'password' => 'passwd', 'lastLogin' => 'lastlogin', 'isActive' => 'is_active'); Index: pear/Perm_LiveUser/Auth/Container/MDB.php diff -u pear/Perm_LiveUser/Auth/Container/MDB.php:1.13 pear/Perm_LiveUser/Auth/Container/MDB.php:1.14 --- pear/Perm_LiveUser/Auth/Container/MDB.php:1.13 Fri Sep 12 08:57:10 2003 +++ pear/Perm_LiveUser/Auth/Container/MDB.php Thu Sep 25 15:11:48 2003 @@ -48,7 +48,7 @@ * 'allowDuplicateHandles' => 1); * * @author Markus Wolff <wolff@21st.de> - * @version $Id: MDB.php,v 1.13 2003/09/12 12:57:10 lsmith Exp $ + * @version $Id: MDB.php,v 1.14 2003/09/25 19:11:48 arnaud Exp $ * @package LiveUser * @category authentication */ @@ -90,7 +90,7 @@ */ var $authTableCols = array('userId' => array('name' => 'auth_user_id', 'type' => 'text'), 'handle' => array('name' => 'handle', 'type' => 'text'), - 'password' => array('name' => 'password', 'type' => 'text'), + 'password' => array('name' => 'passwd', 'type' => 'text'), 'lastLogin' => array('name' => 'lastlogin', 'type' => 'timestamp'), 'isActive' => array('name' => 'is_active', 'type' => 'boolean')); Index: pear/Perm_LiveUser/examples/example3/demodata.sql diff -u pear/Perm_LiveUser/examples/example3/demodata.sql:1.6 pear/Perm_LiveUser/examples/example3/demodata.sql:1.7 --- pear/Perm_LiveUser/examples/example3/demodata.sql:1.6 Fri Sep 12 08:57:17 2003 +++ pear/Perm_LiveUser/examples/example3/demodata.sql Thu Sep 25 15:11:49 2003 @@ -1,11 +1,11 @@ -# $Id: demodata.sql,v 1.6 2003/09/12 12:57:17 lsmith Exp $ +# $Id: demodata.sql,v 1.7 2003/09/25 19:11:49 arnaud Exp $ # Creating tables ... CREATE TABLE liveuser_users ( auth_user_id varchar(32) NOT NULL default '0', handle varchar(32) NOT NULL default '', -password varchar(32) NOT NULL default '', +passwd varchar(32) NOT NULL default '', lastlogin datetime default NULL, owner_user_id bigint UNSIGNED default NULL, owner_group_id int(11) UNSIGNED default NULL, @@ -295,8 +295,8 @@ INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (1, 1, 'Lesen', 'Der Benutzer darf etwas lesen.'); INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (2, 1, 'Schreiben', 'Der Benutzer darf etwas schreiben.'); -INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (3, 1, 'Zugangang', '"Sesam öffne dich"-Recht'); -INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (4, 1, 'Feuer', 'Atombombe zünden'); +INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (3, 1, 'Zugangang', '"Sesam ?ffne dich"-Recht'); +INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (4, 1, 'Feuer', 'Atombombe z?nden'); INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (5, 1, 'Lift up', 'Alien Raumschiff fliegen'); INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (6, 1, 'Kaffee machen', 'Kaffeepulver, Wasser, einschalten, warten ...'); INSERT INTO liveuser_rights_names (right_id, language_id, right_name, right_comment) VALUES (7, 1, 'Kaffee trinken', 'Ahh, Koffein'); Index: pear/Perm_LiveUser/sql/Perm_DB_Complex.sql diff -u pear/Perm_LiveUser/sql/Perm_DB_Complex.sql:1.15 pear/Perm_LiveUser/sql/Perm_DB_Complex.sql:1.16 --- pear/Perm_LiveUser/sql/Perm_DB_Complex.sql:1.15 Wed Sep 17 13:37:24 2003 +++ pear/Perm_LiveUser/sql/Perm_DB_Complex.sql Thu Sep 25 15:11:50 2003 @@ -125,7 +125,7 @@ CREATE TABLE `liveuser_languages` ( `language_id` smallint(5) unsigned NOT NULL default '0', `two_letter_name` char(2) default 'NU', - `native_name` varchar(50) default 'NULL', + `native_name` varchar(50) default NULL, PRIMARY KEY (`language_id`) ) TYPE=MyISAM;