cvs: pear /LiveUser_Admin/Perm Complex.php
| From: | Lukas Smith | Date: | Wed, 17 Aug 2005 11:38:21 +0000 |
| Subject: | cvs: pear /LiveUser_Admin/Perm Complex.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-34059@lists.php.net to get a copy of this message | ||
lsmith Wed Aug 17 07:38:21 2005 EDT
Modified files:
/pear/LiveUser_Admin/Perm Complex.php
Log:
- cosmetic fixes
http://cvs.php.net/diff.php/pear/LiveUser_Admin/Perm/Complex.php?r1=1.66&r2=1.67&ty=u
Index: pear/LiveUser_Admin/Perm/Complex.php
diff -u pear/LiveUser_Admin/Perm/Complex.php:1.66 pear/LiveUser_Admin/Perm/Complex.php:1.67
--- pear/LiveUser_Admin/Perm/Complex.php:1.66 Wed Aug 17 07:01:52 2005
+++ pear/LiveUser_Admin/Perm/Complex.php Wed Aug 17 07:38:21 2005
@@ -57,7 +57,7 @@
* @author Bjoern Kraus <krausbn@php.net>
* @copyright 2002-2005 Markus Wolff
* @license http://www.gnu.org/licenses/lgpl.txt
- * @version CVS: $Id: Complex.php,v 1.66 2005/08/17 11:01:52 dufuz Exp $
+ * @version CVS: $Id: Complex.php,v 1.67 2005/08/17 11:38:21 lsmith Exp $
* @link http://pear.php.net/LiveUser_Admin
*/
@@ -66,7 +66,6 @@
*/
require_once 'LiveUser/Admin/Perm/Medium.php';
-
/**
* Complex permission administration class
*
@@ -121,9 +120,7 @@
*/
function assignSubGroup($data)
{
- if (isset($data['group_id']) && isset($data['subgroup_id'])
- && $data['subgroup_id'] == $data['group_id']
- ) {
+ if ($data['subgroup_id'] == $data['group_id']) {
$this->_stack->push(
LIVEUSER_ADMIN_ERROR, 'exception',
array('msg' => 'Parent group id is the same as the subgroup
id')
@@ -299,7 +296,8 @@
),
'filters' => array(
'perm_user_id' => $data['perm_user_id']
- )
+ ),
+ 'select' => 'row',
);
$result = parent::getUsers($params);
@@ -307,7 +305,7 @@
return false;
}
- if ($result[0]['perm_type'] < 3) {
+ if (!isset($result['perm_type']) || $result['perm_type'] < 3) {
$this->_stack->push(
LIVEUSER_ADMIN_ERROR, 'exception',
array('msg' => 'The user doesn\'t have sufficient
rights')