Menu
▾
▴
[mxbb-commits] mx_pafiledb/pafiledb/admin admin_ug_auth_manage.php, 1.10, 1.11
|
From: FlorinCB <ory...@us...> - 2008-10-16 23:37:27
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/admin In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7462 Modified Files: admin_ug_auth_manage.php Log Message: select all groups phpbb2 and phpbb3 Index: admin_ug_auth_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_ug_auth_manage.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_ug_auth_manage.php 16 Oct 2008 22:57:34 -0000 1.10 --- admin_ug_auth_manage.php 16 Oct 2008 23:37:18 -0000 1.11 *************** *** 78,86 **** if ( $mode == 'user' ) { ! $sql = "SELECT g.group_id ! FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug ! WHERE ug.user_id = $user_id ! AND g.group_id = ug.group_id ! AND g.group_single_user = '1'"; if ( !( $result = $db->sql_query( $sql ) ) ) { --- 78,105 ---- if ( $mode == 'user' ) { ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! ! $sql = "SELECT g.group_id ! FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug ! WHERE ug.user_id = $user_id ! AND g.group_id = ug.group_id ! AND g.group_single_user = '1'"; ! ! break; ! ! case 'phpbb3': ! ! $sql = "SELECT g.group_id ! FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug ! LEFT JOIN " . USERS_TABLE . " u ON (ug.group_id = u.group_id) ! WHERE ug.user_id = $user_id ! AND g.group_id = ug.group_id"; ! ! break; ! } ! if ( !( $result = $db->sql_query( $sql ) ) ) { *************** *** 105,109 **** } ! $sql = ( $mode == 'user' ) ? "SELECT aa.* FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = " . true : "SELECT * FROM " . PA_AUTH_ACCESS_TABLE . " WHERE group_id = $group_id"; if ( !( $result = $db->sql_query( $sql ) ) ) { --- 124,143 ---- } ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! ! $sql = ( $mode == 'user' ) ? "SELECT aa.* FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = " . true : "SELECT * FROM " . PA_AUTH_ACCESS_TABLE . " WHERE group_id = $group_id"; ! ! break; ! ! case 'phpbb3': ! ! $sql = ( $mode == 'user' ) ? "SELECT aa.* FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g LEFT JOIN " . USERS_TABLE . " u ON (ug.group_id = u.group_id) WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id" : "SELECT * FROM " . PA_AUTH_ACCESS_TABLE . " WHERE group_id = $group_id"; ! ! break; ! } ! if ( !( $result = $db->sql_query( $sql ) ) ) { *************** *** 244,252 **** if ( $mode == 'global_user' ) { ! $sql = "SELECT g.group_id ! FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug ! WHERE ug.user_id = $user_id ! AND g.group_id = ug.group_id ! AND g.group_single_user = '1'"; if ( !( $result = $db->sql_query( $sql ) ) ) { --- 278,306 ---- if ( $mode == 'global_user' ) { ! ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! ! $sql = "SELECT g.group_id ! FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug ! WHERE ug.user_id = $user_id ! AND g.group_id = ug.group_id ! AND g.group_single_user = '1'"; ! ! break; ! ! case 'phpbb3': ! ! $sql = "SELECT g.group_id ! FROM " . GROUPS_TABLE . " g ! LEFT JOIN " . USER_GROUP_TABLE . " ug ON (ug.group_id = g.group_id) ! WHERE ug.user_id = " . $user_id . " ! ORDER BY g.group_type DESC, g.group_id DESC"; ! ! break; ! } ! if ( !( $result = $db->sql_query( $sql ) ) ) { *************** *** 384,389 **** // Front end ! $sql = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug WHERE "; ! $sql .= ( $mode == 'user' ) ? "u.user_id = $user_id AND ug.user_id = u.user_id AND g.group_id = ug.group_id" : "g.group_id = $group_id AND ug.group_id = g.group_id AND u.user_id = ug.user_id"; if ( !( $result = $db->sql_query( $sql ) ) ) { --- 438,468 ---- // Front end ! ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! ! $sql = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user ! FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug ! WHERE "; ! ! $sql .= ( $mode == 'user' ) ? "u.user_id = $user_id AND ug.user_id = u.user_id AND g.group_id = ug.group_id" : "g.group_id = $group_id AND ug.group_id = g.group_id AND u.user_id = ug.user_id"; ! ! break; ! ! case 'phpbb3': ! ! $sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending ! FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug ! WHERE "; ! ! $sql .= ( $mode == 'user' ) ? "u.user_id = $user_id AND ug.user_id = u.user_id" : "ug.group_id = $group_id AND u.user_id = ug.user_id"; ! ! $sql .= " ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username_clean"; ! ! break; ! } ! if ( !( $result = $db->sql_query( $sql ) ) ) { *************** *** 396,401 **** } $db->sql_freeresult( $result ); - $sql = ( $mode == 'user' ) ? "SELECT aa.*, g.group_single_user FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = 1" : "SELECT * FROM " . PA_AUTH_ACCESS_TABLE . " WHERE group_id = $group_id"; if ( !( $result = $db->sql_query( $sql ) ) ) { --- 475,504 ---- } $db->sql_freeresult( $result ); + + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + + $sql = ( $mode == 'user' ) ? "SELECT aa.*, g.group_single_user FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = 1" : "SELECT * FROM " . PA_AUTH_ACCESS_TABLE . " WHERE group_id = $group_id"; + break; + + case 'phpbb3': + + $sql_user = 'SELECT aa.*, g.group_name, g.group_id, g.group_type + FROM ' . GROUPS_TABLE . ' g, ' . PA_AUTH_ACCESS_TABLE . ' aa + LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (ug.group_id = g.group_id) + WHERE ug.user_id = ' . $user_id . ' + AND g.group_id = aa.group_id + ORDER BY g.group_type DESC, g.group_id DESC'; + + $sql_group = 'SELECT * + FROM ' . PA_AUTH_ACCESS_TABLE . ' + WHERE group_id = ' . $group_id; + + $sql = ( $mode == 'user' ) ? $sql_user : $sql_group; + break; + } if ( !( $result = $db->sql_query( $sql ) ) ) { *************** *** 598,607 **** if ( $mode == 'global_user' ) ! { ! $sql = "SELECT g.group_id ! FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug ! WHERE ug.user_id = $user_id ! AND g.group_id = ug.group_id ! AND g.group_single_user = '1'"; if ( !( $result = $db->sql_query( $sql ) ) ) { --- 701,727 ---- if ( $mode == 'global_user' ) ! { ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! ! case 'phpbb2': ! $sql = "SELECT g.group_id ! FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug ! WHERE ug.user_id = $user_id ! AND g.group_id = ug.group_id ! AND g.group_single_user = '1'"; ! break; ! ! case 'phpbb3': ! ! $sql = "SELECT g.group_id ! FROM " . GROUPS_TABLE . " g ! LEFT JOIN " . USER_GROUP_TABLE . " ug ON (ug.group_id = g.group_id) ! WHERE ug.user_id = " . $user_id . " ! ORDER BY g.group_type DESC, g.group_id DESC"; ! break; ! } ! if ( !( $result = $db->sql_query( $sql ) ) ) { *************** *** 613,618 **** } ! $sql = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug WHERE "; ! $sql .= ( $mode == 'global_user' ) ? "u.user_id = $user_id AND ug.user_id = u.user_id AND g.group_id = ug.group_id" : "g.group_id = $group_id AND ug.group_id = g.group_id AND u.user_id = ug.user_id"; if ( !( $result = $db->sql_query( $sql ) ) ) { --- 733,773 ---- } ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! ! case 'phpbb2': ! $sql_user = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user ! FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug ! WHERE u.user_id = $user_id ! AND ug.user_id = u.user_id ! AND g.group_id = ug.group_id" ! $sql_group = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user ! FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug ! WHERE g.group_id = $group_id ! AND ug.group_id = g.group_id ! AND u.user_id = ug.user_id"; ! ! break; ! ! case 'phpbb3': ! $sql_user = 'SELECT u.*, g.group_name, g.group_id, g.group_type ! FROM ' . USERS_TABLE . ' u, ' . GROUPS_TABLE . ' g ! LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (ug.group_id = g.group_id) ! WHERE u.user_id = ' . $user_id . ' ! AND ug.user_id = u.user_id ! ORDER BY g.group_type DESC, g.group_id DESC'; ! ! $sql_group = 'SELECT u.*, g.group_name, g.group_id, g.group_type ! FROM ' . USERS_TABLE . ' u, ' . GROUPS_TABLE . ' g ! LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (ug.group_id = g.group_id) ! WHERE g.group_id = ' . $group_id . ' ! AND ug.user_id = u.user_id ! ORDER BY g.group_type DESC, g.group_id DESC'; ! break; ! } ! ! $sql = ( $mode == 'global_user' ) ? $sql_user : $sql_group; ! if ( !( $result = $db->sql_query( $sql ) ) ) { *************** *** 626,631 **** $db->sql_freeresult( $result ); ! $sql = ( $mode == 'global_user' ) ? "SELECT aa.*, g.group_single_user FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = 1 AND aa.cat_id = '0'" : "SELECT * FROM " . PA_AUTH_ACCESS_TABLE . " WHERE group_id = $group_id AND cat_id = '0'"; ! if ( !( $result = $db->sql_query( $sql ) ) ) { mx_message_die( GENERAL_ERROR, "Couldn't obtain user/group permissions", "", __LINE__, __FILE__, $sql ); --- 781,819 ---- $db->sql_freeresult( $result ); ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! ! case 'phpbb2': ! $sql_user = "SELECT aa.*, g.group_single_user ! FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g ! WHERE ug.user_id = $user_id ! AND g.group_id = ug.group_id ! AND aa.group_id = ug.group_id ! AND g.group_single_user = 1 ! AND aa.cat_id = '0'" ! ! break; ! ! case 'phpbb3': ! $sql_user = "SELECT aa.*, g.group_id ! FROM " . PA_AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u ! WHERE ug.user_id = $user_id ! AND u.group_id = ug.group_id ! AND g.group_id = ug.group_id ! AND aa.group_id = ug.group_id ! AND aa.cat_id = 0 ! ORDER BY g.group_type DESC, g.group_id DESC"; ! break; ! } ! ! $sql_group = 'SELECT * ! FROM ' . PA_AUTH_ACCESS_TABLE . ' ! WHERE group_id = ' . $group_id . ' ! AND cat_id = 0'; ! ! $sql = ($mode == 'global_user') ? $sql_user : $sql_group; ! ! if ( !($result = $db->sql_query($sql)) ) { mx_message_die( GENERAL_ERROR, "Couldn't obtain user/group permissions", "", __LINE__, __FILE__, $sql ); |
