cvs: pear /Perm_LiveUser/Admin/Perm/Container DB_Medium.php DB_Simple.php MDB2_Medium.php MDB2_Simple.php MDB_Medium.php MDB_Simple.php

lsmith Fri Apr 23 10:04:35 2004 EDT Modified files: /pear/Perm_LiveUser/Admin/Perm/Container DB_Medium.php DB_Simple.php MDB2_Medium.php MDB2_Simple.php MDB_Medium.php MDB_Simple.php Log: - typo fixes (thx Marco for spotting)

http://cvs.php.net/diff.php/pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php?r1=1.46&r2=1.47&ty=u Index: pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php:1.46 pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php:1.47 --- pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php:1.46 Fri Apr 23 00:28:22 2004 +++ pear/Perm_LiveUser/Admin/Perm/Container/DB_Medium.php Fri Apr 23 10:04:35 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.46 2004/04/23 04:28:22 dufuz Exp $ + * @version $Id: DB_Medium.php,v 1.47 2004/04/23 14:04:35 lsmith Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_DB_Medium extends LiveUser_Admin_Perm_Container_DB_Simple @@ -305,7 +305,7 @@ } /** - * Grand right to group + * Grant right to group * * @access public * @param integer id of group @@ -362,10 +362,10 @@ ' . $this->prefix . 'grouprights WHERE group_id = ' . (int)$group_id; - if(!is_null($right_id)) { - 'AND - right_id = ' . (int)$right_id; - } + if (!is_null($right_id)) { + $query .= ' AND + right_id = ' . (int)$right_id; + } $result = $this->dbc->query($query); http://cvs.php.net/diff.php/pear/Perm_LiveUser/Admin/Perm/Container/DB_Simple.php?r1=1.20&r2=1.21&ty=u Index: pear/Perm_LiveUser/Admin/Perm/Container/DB_Simple.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/DB_Simple.php:1.20 pear/Perm_LiveUser/Admin/Perm/Container/DB_Simple.php:1.21 --- pear/Perm_LiveUser/Admin/Perm/Container/DB_Simple.php:1.20 Fri Apr 23 00:28:22 2004 +++ pear/Perm_LiveUser/Admin/Perm/Container/DB_Simple.php Fri Apr 23 10:04:35 2004 @@ -32,7 +32,7 @@ * @author Christian Dickmann <dickmann@php.net> * @author Markus Wolff <wolff@21st.de> * @author Matt Scifo <mscifo@php.net> - * @version $Id: DB_Simple.php,v 1.20 2004/04/23 04:28:22 dufuz Exp $ + * @version $Id: DB_Simple.php,v 1.21 2004/04/23 14:04:35 lsmith Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_DB_Simple extends LiveUser_Admin_Perm_Common @@ -1222,10 +1222,10 @@ ' . $this->prefix . 'userrights WHERE perm_user_id = ' . (int)$permId; - if(!is_null($right_id)) { - 'AND - right_id = ' . (int) $right_id; - } + if (!is_null($right_id)) { + $query .= ' AND + right_id = ' . (int) $right_id; + } $result = $this->dbc->query($query); http://cvs.php.net/diff.php/pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Medium.php?r1=1.8&r2=1.9&ty=u Index: pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Medium.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Medium.php:1.8 pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Medium.php:1.9 --- pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Medium.php:1.8 Fri Apr 23 00:28:22 2004 +++ pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Medium.php Fri Apr 23 10:04:35 2004 @@ -47,7 +47,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.8 2004/04/23 04:28:22 dufuz Exp $ + * @version $Id: MDB2_Medium.php,v 1.9 2004/04/23 14:04:35 lsmith Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_MDB2_Medium extends LiveUser_Admin_Perm_Container_MDB2_Simple @@ -301,7 +301,7 @@ } /** - * Grand right to group + * Grant right to group * * @access public * @param integer id of group @@ -358,10 +358,10 @@ ' . $this->prefix . 'grouprights WHERE group_id = ' . $this->dbc->getValue('integer', $group_id); - if(!is_null($right_id)) { - 'AND - right_id = ' . $this->dbc->getValue('integer', $right_id); - } + if (!is_null($right_id)) { + $query .= ' AND + right_id = ' . $this->dbc->getValue('integer', $right_id); + } $result = $this->dbc->query($query); http://cvs.php.net/diff.php/pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Simple.php?r1=1.15&r2=1.16&ty=u Index: pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Simple.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Simple.php:1.15 pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Simple.php:1.16 --- pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Simple.php:1.15 Fri Apr 23 00:28:22 2004 +++ pear/Perm_LiveUser/Admin/Perm/Container/MDB2_Simple.php Fri Apr 23 10:04:35 2004 @@ -29,7 +29,7 @@ * groups assignements and more see DB_Medium and DB_Complex. * * @category authentication - * @version $Id: MDB2_Simple.php,v 1.15 2004/04/23 04:28:22 dufuz Exp $ + * @version $Id: MDB2_Simple.php,v 1.16 2004/04/23 14:04:35 lsmith Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_MDB2_Simple extends LiveUser_Admin_Perm_Common @@ -1134,7 +1134,7 @@ } /** - * Grand right to user + * Grant right to user * * @access public * @param string id of user @@ -1221,10 +1221,10 @@ ' . $this->prefix . 'userrights WHERE perm_user_id = ' . $this->dbc->getValue('integer', $permId); - if(!is_null($right_id)) { - 'AND - right_id = ' . $this->dbc->getValue('integer', $right_id); - } + if (!is_null($right_id)) { + $query .= ' AND + right_id = ' . $this->dbc->getValue('integer', $right_id); + } $result = $this->dbc->query($query); @@ -1689,7 +1689,7 @@ $res[$k]['groups'] = $this->getGroups(array('where_user_id' => $v['perm_user_id'])); } } - } else if(!MDB2::isError($res)) { + } else if (!MDB2::isError($res)) { $res = array(); } return $res; http://cvs.php.net/diff.php/pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php?r1=1.34&r2=1.35&ty=u Index: pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php:1.34 pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php:1.35 --- pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php:1.34 Fri Apr 23 00:28:22 2004 +++ pear/Perm_LiveUser/Admin/Perm/Container/MDB_Medium.php Fri Apr 23 10:04:35 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.34 2004/04/23 04:28:22 dufuz Exp $ + * @version $Id: MDB_Medium.php,v 1.35 2004/04/23 14:04:35 lsmith Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_MDB_Medium extends LiveUser_Admin_Perm_Container_MDB_Simple @@ -300,7 +300,7 @@ } /** - * Grand right to group + * Grant right to group * * @access public * @param integer id of group @@ -357,10 +357,10 @@ ' . $this->prefix . 'grouprights WHERE group_id = ' . $this->dbc->getValue('integer', $group_id); - if(!is_null($right_id)) { - 'AND - right_id = ' . $this->dbc->getValue('integer', $right_id); - } + if (!is_null($right_id)) { + $query .= ' AND + right_id = ' . $this->dbc->getValue('integer', $right_id); + } $result = $this->dbc->query($query); http://cvs.php.net/diff.php/pear/Perm_LiveUser/Admin/Perm/Container/MDB_Simple.php?r1=1.29&r2=1.30&ty=u Index: pear/Perm_LiveUser/Admin/Perm/Container/MDB_Simple.php diff -u pear/Perm_LiveUser/Admin/Perm/Container/MDB_Simple.php:1.29 pear/Perm_LiveUser/Admin/Perm/Container/MDB_Simple.php:1.30 --- pear/Perm_LiveUser/Admin/Perm/Container/MDB_Simple.php:1.29 Fri Apr 23 00:28:22 2004 +++ pear/Perm_LiveUser/Admin/Perm/Container/MDB_Simple.php Fri Apr 23 10:04:35 2004 @@ -29,7 +29,7 @@ * groups assignements and more see DB_Medium and DB_Complex. * * @category authentication - * @version $Id: MDB_Simple.php,v 1.29 2004/04/23 04:28:22 dufuz Exp $ + * @version $Id: MDB_Simple.php,v 1.30 2004/04/23 14:04:35 lsmith Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_Container_MDB_Simple extends LiveUser_Admin_Perm_Common @@ -1134,7 +1134,7 @@ } /** - * Grand right to user + * Grant right to user * * @access public * @param string id of user @@ -1221,10 +1221,10 @@ ' . $this->prefix . 'userrights WHERE perm_user_id = ' . $this->dbc->getValue('integer', $permId); - if(!is_null($right_id)) { - 'AND - right_id = ' . $this->dbc->getValue('integer', $right_id); - } + if (!is_null($right_id)) { + $query .= ' AND + right_id = ' . $this->dbc->getValue('integer', $right_id); + } $result = $this->dbc->query($query); @@ -1689,7 +1689,7 @@ $res[$k]['groups'] = $this->getGroups(array('where_user_id' => $v['perm_user_id'])); } } - } else if(!MDB::isError($res)) { + } else if (!MDB::isError($res)) { $res = array(); } return $res;