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

arnaud Thu Dec 4 15:24:41 2003 EDT Modified files: /pear/Perm_LiveUser/Admin/Perm DB_Common.php MDB_Common.php Log: * standard compliant sql * cosmetic

Index: pear/Perm_LiveUser/Admin/Perm/DB_Common.php diff -u pear/Perm_LiveUser/Admin/Perm/DB_Common.php:1.34 pear/Perm_LiveUser/Admin/Perm/DB_Common.php:1.35 --- pear/Perm_LiveUser/Admin/Perm/DB_Common.php:1.34 Thu Dec 4 11:16:58 2003 +++ pear/Perm_LiveUser/Admin/Perm/DB_Common.php Thu Dec 4 15:24:41 2003 @@ -33,7 +33,7 @@ * DB based containers used to maintain * the permission database. * - * @version $Id: DB_Common.php,v 1.34 2003/12/04 16:16:58 arnaud Exp $ + * @version $Id: DB_Common.php,v 1.35 2003/12/04 20:24:41 arnaud Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_DB_Common extends LiveUser_Admin_Perm_Common @@ -1219,10 +1219,10 @@ function getApplications($options = null) { $query = 'SELECT - applications.application_id AS application_id, + applications.application_id AS application_id, applications.application_define_name AS define_name, - translations.name AS name, - translations.comment AS comment + translations.name AS name, + translations.comment AS comment FROM ' . $this->prefix . 'applications applications, ' . $this->prefix . 'translations translations @@ -1270,10 +1270,10 @@ function getAreas($options = null) { $query = 'SELECT - areas.area_id AS area_id, - areas.application_id AS application_id, - translations.name AS name, - translations.comment AS comment, + areas.area_id AS area_id, + areas.application_id AS application_id, + translations.name AS name, + translations.comment AS comment, areas.area_define_name AS define_name FROM ' . $this->prefix . 'areas areas, @@ -1337,9 +1337,9 @@ function getLanguages($options = null) { $query = 'SELECT - languages.language_id AS language_id, + languages.language_id AS language_id, languages.two_letter_name AS two_letter_code, - languages.native_name AS name + languages.native_name AS name FROM ' . $this->prefix . 'languages languages'; @@ -1362,8 +1362,8 @@ && $options['with_translations']) { $query = 'SELECT translations.native_language_id AS native_language_id, - languages.two_letter_name AS two_letter_code, - translations.native_name AS translations + languages.two_letter_name AS two_letter_code, + translations.native_name AS translations FROM ' . $this->prefix . 'languages languages, ' . $this->prefix . 'translations translations @@ -1412,8 +1412,8 @@ function getRights($options = null) { $query = 'SELECT - rights.right_id AS right_id, - rights.area_id AS area_id, + rights.right_id AS right_id, + rights.area_id AS area_id, areas.application_id AS application_id,'; if (isset($options['where_user_id'])) { @@ -1425,27 +1425,28 @@ $query .= ' grouprights.group_id AS group_id,'; } - $query .= ' rights.right_define_name AS define_name, - rights.has_implied AS has_implied, - rights.has_level AS has_level, - rights.has_scope AS has_scope, - translations.name AS name, - translations.comment AS comment + $query .= ' + rights.right_define_name AS define_name, + rights.has_implied AS has_implied, + rights.has_level AS has_level, + rights.has_scope AS has_scope, + translations.name AS name, + translations.comment AS comment FROM ' . $this->prefix . 'rights rights, ' . $this->prefix . 'areas areas, ' . $this->prefix . 'applications applications,'; if (isset($options['where_user_id'])) { - $query .= ' ' . $this->prefix . 'userrights AS userrights,'; + $query .= ' ' . $this->prefix . 'userrights userrights,'; } if (isset($options['where_group_id']) && is_numeric($options['where_group_id'])) { - $query .= ' ' . $this->prefix . 'grouprights AS grouprights,'; + $query .= ' ' . $this->prefix . 'grouprights grouprights,'; } - $query .= ' ' . $this->prefix . 'translations AS translations + $query .= ' ' . $this->prefix . 'translations translations WHERE'; if (isset($options['where_right_id']) Index: pear/Perm_LiveUser/Admin/Perm/MDB_Common.php diff -u pear/Perm_LiveUser/Admin/Perm/MDB_Common.php:1.19 pear/Perm_LiveUser/Admin/Perm/MDB_Common.php:1.20 --- pear/Perm_LiveUser/Admin/Perm/MDB_Common.php:1.19 Thu Dec 4 11:16:58 2003 +++ pear/Perm_LiveUser/Admin/Perm/MDB_Common.php Thu Dec 4 15:24:41 2003 @@ -33,7 +33,7 @@ * MDB based containers used to maintain * the permission database. * - * @version $Id: MDB_Common.php,v 1.19 2003/12/04 16:16:58 arnaud Exp $ + * @version $Id: MDB_Common.php,v 1.20 2003/12/04 20:24:41 arnaud Exp $ * @package LiveUser */ class LiveUser_Admin_Perm_MDB_Common extends LiveUser_Admin_Perm_Common @@ -1190,10 +1190,10 @@ function getApplications($options = null) { $query = 'SELECT - applications.application_id as application_id, - applications.application_define_name as define_name, - translations.name as name, - translations.comment as comment + applications.application_id AS application_id, + applications.application_define_name AS define_name, + translations.name AS name, + translations.comment AS comment FROM ' . $this->prefix . 'applications applications, ' . $this->prefix . 'translations translations @@ -1238,11 +1238,11 @@ function getAreas($options = null) { $query = 'SELECT - areas.area_id as area_id, - areas.application_id as application_id, - translations.name as name, - translations.comment as comment, - areas.area_define_name as define_name + areas.area_id AS area_id, + areas.application_id AS application_id, + translations.name AS name, + translations.comment AS comment, + areas.area_define_name AS define_name FROM ' . $this->prefix . 'areas areas, ' . $this->prefix . 'translations translations @@ -1304,9 +1304,9 @@ function getLanguages($options = null) { $query = 'SELECT - languages.language_id as language_id, - languages.two_letter_name as two_letter_code, - languages.native_name as name + languages.language_id AS language_id, + languages.two_letter_name AS two_letter_code, + languages.native_name AS name FROM ' . $this->prefix . 'languages languages'; @@ -1324,9 +1324,9 @@ if (isset($options['with_translations']) && $options['with_translations']) { $query = 'SELECT - translations.native_language_id as native_language_id, - languages.two_letter_name as two_letter_code, - translations.native_name as translations + translations.native_language_id AS native_language_id, + languages.two_letter_name AS two_letter_code, + translations.native_name AS translations FROM ' . $this->prefix . 'languages languages, ' . $this->prefix . 'translations translations @@ -1379,25 +1379,26 @@ function getRights($options = null) { $query = 'SELECT - rights.right_id as right_id, - rights.area_id as area_id, - areas.application_id as application_id,'; + rights.right_id AS right_id, + rights.area_id AS area_id, + areas.application_id AS application_id,'; if (isset($options['where_user_id'])) { - $query .= ' userrights.perm_user_id as user_id,'; + $query .= ' userrights.perm_user_id AS user_id,'; } if (isset($options['where_group_id']) && is_numeric($options['where_group_id'])) { - $query .= ' grouprights.group_id as group_id,'; + $query .= ' grouprights.group_id AS group_id,'; } - $query .= ' rights.right_define_name as define_name, - rights.has_implied as has_implied, - rights.has_level as has_level, - rights.has_scope as has_scope, - translations.name as name, - translations.comment as comment + $query .= ' + rights.right_define_name AS define_name, + rights.has_implied AS has_implied, + rights.has_level AS has_level, + rights.has_scope AS has_scope, + translations.name AS name, + translations.comment AS comment FROM ' . $this->prefix . 'rights rights, ' . $this->prefix . 'areas areas, @@ -1603,4 +1604,4 @@ } } -?> +?> \ No newline at end of file