|
From: FlorinCB <ory...@us...> - 2008-08-29 05:58:56
|
Update of /cvsroot/mxbb/mx_smartor/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10881/admin Modified Files: admin_album_auth.php admin_album_personal.php Log Message: Upgrade Index: admin_album_personal.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_personal.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** admin_album_personal.php 27 Mar 2008 14:30:58 -0000 1.15 --- admin_album_personal.php 29 Aug 2008 05:58:22 -0000 1.16 *************** *** 153,161 **** 'body' => $acp_prefix . 'album_personal_body.tpl') ); // Get the list of phpBB usergroups $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE ." ORDER BY group_name ASC"; if ( !($result = $db->sql_query($sql)) ) --- 153,173 ---- 'body' => $acp_prefix . 'album_personal_body.tpl') ); + + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $sql_where = 'group_single_user <> " . true . "'; + break; + + case 'phpbb3': + $sql_where = 'group_id <> " . true . "'; + break; + } // Get the list of phpBB usergroups $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " ! WHERE " . $sql_where . " ORDER BY group_name ASC"; if ( !($result = $db->sql_query($sql)) ) Index: admin_album_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_auth.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** admin_album_auth.php 27 Mar 2008 14:30:43 -0000 1.17 --- admin_album_auth.php 29 Aug 2008 05:58:22 -0000 1.18 *************** *** 215,218 **** --- 215,230 ---- 'S_ALBUM_ACTION' => mx_append_sid( "admin_album_auth.$phpEx?cat_id=$cat_id" ), )); + + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $sql_where = 'group_single_user <> " . true . "'; + break; + + case 'phpbb3': + $sql_where = 'group_id <> " . true . "'; + break; + } // *************** *** 221,225 **** $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . true . " ORDER BY group_name ASC"; if ( !( $result = $db->sql_query( $sql ) ) ) --- 233,237 ---- $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " ! WHERE " . $sql_where . " ORDER BY group_name ASC"; if ( !( $result = $db->sql_query( $sql ) ) ) |