cvs: pear /Perm_LiveUser/Admin/Perm DB_Common.php MDB_Common.php

arnaud Thu Dec 4 15:34:30 2003 EDT Modified files: /pear/Perm_LiveUser/Admin/Perm DB_Common.php MDB_Common.php Log: * attempt at fixing #345 Index: pear/Perm_LiveUser/Admin/Perm/DB_Common.php diff -u pear/Perm_LiveUser/Admin/Perm/DB_Common.php:1.35 pear/Perm_LiveUser/Admin/Perm/DB_Common.php:1.36 --- pear/Perm_LiveUser/Admin/Perm/DB_Common.php:1.35 Thu Dec 4 15:24:41 2003 +++ pear/Perm_LiveUser/Admin/Perm/DB_Common.php Thu Dec 4 15:34:30 2003 @@ -33,7 +33,7 @@ * DB based containers used to maintain * the permission database. * - * @version $Id: DB_Common.php,v 1.35 2003/12/04 20:24:41 arnaud Exp $ + * @version $Id: DB_Common.php,v 1.36 2003/12/04 20:34:30 arnaud Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_DB_Common extends LiveUser_Admin_Perm_Common @@ -1486,7 +1486,21 @@ translations.language_id = ' . (int)($this->_langs[$this->getCurrentLanguage()]) . ' GROUP BY - right_id + right_id, rights.area_id, areas.application_id'; + + if (isset($options['where_user_id'])) { + $query .= ',userrights.perm_user_id'; + } + + if (isset($options['where_group_id']) + && is_numeric($options['where_group_id'])) { + $query .= ',grouprights.group_id'; + } + + $query .= ' + ,rights.right_define_name, rights.has_implied, + rights.has_level, rights.has_scope, + translations.name, translations.comment ORDER BY rights.area_id ASC'; Index: pear/Perm_LiveUser/Admin/Perm/MDB_Common.php diff -u pear/Perm_LiveUser/Admin/Perm/MDB_Common.php:1.20 pear/Perm_LiveUser/Admin/Perm/MDB_Common.php:1.21 --- pear/Perm_LiveUser/Admin/Perm/MDB_Common.php:1.20 Thu Dec 4 15:24:41 2003 +++ pear/Perm_LiveUser/Admin/Perm/MDB_Common.php Thu Dec 4 15:34:30 2003 @@ -33,7 +33,7 @@ * MDB based containers used to maintain * the permission database. * - * @version $Id: MDB_Common.php,v 1.20 2003/12/04 20:24:41 arnaud Exp $ + * @version $Id: MDB_Common.php,v 1.21 2003/12/04 20:34:30 arnaud Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_MDB_Common extends LiveUser_Admin_Perm_Common @@ -1453,7 +1453,21 @@ translations.language_id = ' . $this->dbc->getIntegerValue($this->_langs[$this->getCurrentLanguage()]) . ' GROUP BY - right_id + right_id, rights.area_id, areas.application_id'; + + if (isset($options['where_user_id'])) { + $query .= ',userrights.perm_user_id'; + } + + if (isset($options['where_group_id']) + && is_numeric($options['where_group_id'])) { + $query .= ',grouprights.group_id'; + } + + $query .= ' + ,rights.right_define_name, rights.has_implied, + rights.has_level, rights.has_scope, + translations.name, translations.comment ORDER BY rights.area_id ASC';