|
From: Jon O. <jon...@us...> - 2008-07-11 22:00:59
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18968 Modified Files: mx_functions_blockcp.php page_tail.php Log Message: Cleansed mx_functions_blockcp.php Minor fixes Index: mx_functions_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** mx_functions_blockcp.php 9 Mar 2008 23:38:00 -0000 1.26 --- mx_functions_blockcp.php 11 Jul 2008 22:00:04 -0000 1.27 *************** *** 62,66 **** function _controlpanel( $id, $new_block = false ) { ! global $blockcptemplate, $lang, $db, $board_config, $theme, $phpEx, $mx_root_path, $s_hidden_fields, $userdata, $cookie_states, $module_nav_icon_url, $portalpage, $mx_request_vars, $images; $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0; --- 62,66 ---- function _controlpanel( $id, $new_block = false ) { ! global $blockcptemplate, $lang, $db, $board_config, $theme, $phpEx, $mx_root_path, $s_hidden_fields, $userdata, $cookie_states, $module_nav_icon_url, $portalpage, $mx_request_vars, $images, $mx_backend; $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0; *************** *** 472,491 **** // Get the list of phpBB usergroups // ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE . " ! ORDER BY group_name ASC"; ! break; ! case 'phpbb3': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_name NOT IN ('BOTS', 'GUESTS') ! ORDER BY group_name ASC"; ! break; ! } if( !($result = $db->sql_query($sql)) ) --- 472,476 ---- // Get the list of phpBB usergroups // ! $mx_backend->generate_group_select_sql(); if( !($result = $db->sql_query($sql)) ) Index: page_tail.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** page_tail.php 11 Jul 2008 21:23:17 -0000 1.39 --- page_tail.php 11 Jul 2008 22:00:17 -0000 1.40 *************** *** 109,129 **** $mx_backend->page_tail('generate_backend_version'); - /* - switch (PORTAL_BACKEND) - { - case 'internal': - - case 'phpbb2': - - $current_phpbb_version = '2' . $board_config['version']; - break; - - case 'phpbb3': - - $current_phpbb_version = $board_config['version']; - break; - } - */ - $template->assign_vars(array( 'U_PORTAL_ROOT_PATH' => PORTAL_URL, --- 109,112 ---- |