Menu
▾
▴
[mxbb-commits] core/includes mx_auth.php,1.8,1.9 mx_cache.php,1.4,1.5 mx_functions.php,1.42,1.43 page_tail.php,1.15,1.16
|
From: Jon O. <jon...@us...> - 2005-05-01 16:02:24
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11569/includes Modified Files: mx_auth.php mx_cache.php mx_functions.php page_tail.php Log Message: merging rewrites for new cache... Index: mx_cache.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_cache.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_cache.php 25 Apr 2005 01:27:20 -0000 1.4 --- mx_cache.php 1 May 2005 16:02:12 -0000 1.5 *************** *** 13,17 **** */ ! /** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 13,17 ---- */ ! /** * This program is free software; you can redistribute it and/or modify [...1606 lines suppressed...] ! } // class mx_page ! // ! // ------------------------------------------------------------------------------------------------------------- ! // For compatibility with old block calls ! // ! function read_block_config( $block_id, $cache = true ) ! { ! global $mx_cache, $mx_block, $block_config; ! ! if ( empty( $mx_block->block_config[$block_id] ) ) ! { ! return $mx_cache->read( $block_id, MX_BLOCK, !$cache ); } ! ! return $mx_block->block_config; } Index: page_tail.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** page_tail.php 25 Apr 2005 22:04:49 -0000 1.15 --- page_tail.php 1 May 2005 16:02:13 -0000 1.16 *************** *** 39,43 **** // Generate the fold/unfold categories switches // ! if ( $mx_show_edit_blocks_icon ) { $template->assign_block_vars('switch_edit_' . ( $mx_show_edit_blocks_on ? 'on' : 'off' ), array()); --- 39,43 ---- // Generate the fold/unfold categories switches // ! if ( $mx_page->editcp_switch ) { $template->assign_block_vars('switch_edit_' . ( $mx_show_edit_blocks_on ? 'on' : 'off' ), array()); *************** *** 111,117 **** echo pack('V', $gzip_size); } - //echo( '<br><br>'.var_export($_SESSION['mx_config']) ); - //echo( '<br><br>'.var_export($_SESSION['mx_pages']) ); - //echo( '<br><br>'.var_export($_SESSION) ); exit; --- 111,114 ---- Index: mx_auth.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_auth.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mx_auth.php 25 Apr 2005 20:55:06 -0000 1.8 --- mx_auth.php 1 May 2005 16:02:12 -0000 1.9 *************** *** 151,160 **** case AUTH_ACL: // PRIVATE ! $auth_user[$key] = ( $userdata['session_logged_in'] ) ? mx_auth_group($value_groups) || $is_admin : 0; $auth_user[$key . '_type'] = $lang['Auth_Users_granted_access']; break; case AUTH_MOD: ! $auth_user[$key] = ( $userdata['session_logged_in'] ) ? mx_auth_group($f_access_group['auth_moderator_group']) || $is_admin : 0; $auth_user[$key . '_type'] = $lang['Auth_Moderators']; break; --- 151,160 ---- case AUTH_ACL: // PRIVATE ! $auth_user[$key] = ( $userdata['session_logged_in'] ) ? mx_is_group_member($value_groups) || $is_admin : 0; $auth_user[$key . '_type'] = $lang['Auth_Users_granted_access']; break; case AUTH_MOD: ! $auth_user[$key] = ( $userdata['session_logged_in'] ) ? mx_is_group_member($f_access_group['auth_moderator_group']) || $is_admin : 0; $auth_user[$key . '_type'] = $lang['Auth_Moderators']; break; *************** *** 173,178 **** // // Is user a moderator? ! // ! $auth_user['auth_mod'] = ( $userdata['session_logged_in'] ) ? mx_auth_group($f_access_group['auth_moderator_group']) || $is_admin : 0; return $auth_user; --- 173,177 ---- // // Is user a moderator? ! $auth_user['auth_mod'] = ( $userdata['session_logged_in'] ) ? mx_is_group_member($f_access_group['auth_moderator_group']) || $is_admin : 0; return $auth_user; *************** *** 220,230 **** break; ! case AUTH_ACL: // PRIVATE ! $auth_user[$key] = ( $userdata['session_logged_in'] ) ? mx_auth_group($value_groups) || $is_admin : 0; $auth_user[$key . '_type'] = $lang['Auth_Users_granted_access']; break; case AUTH_MOD: ! $auth_user[$key] = ( $userdata['session_logged_in'] ) ? mx_auth_group($f_access_group['auth_moderator_group']) || $is_admin : 0; $auth_user[$key . '_type'] = $lang['Auth_Moderators']; break; --- 219,229 ---- break; ! case AUTH_ACL: // PRIVATE ! $auth_user[$key] = ( $userdata['session_logged_in'] ) ? mx_is_group_member($value_groups) || $is_admin : 0; $auth_user[$key . '_type'] = $lang['Auth_Users_granted_access']; break; case AUTH_MOD: ! $auth_user[$key] = ( $userdata['session_logged_in'] ) ? mx_is_group_member($f_access_group['auth_moderator_group']) || $is_admin : 0; $auth_user[$key . '_type'] = $lang['Auth_Moderators']; break; *************** *** 243,248 **** // // Is user a moderator? ! // ! $auth_user['auth_mod'] = ( $userdata['session_logged_in'] ) ? mx_auth_group($f_access_group['auth_moderator_group']) || $is_admin : 0; return $auth_user; --- 242,246 ---- // // Is user a moderator? ! $auth_user['auth_mod'] = ( $userdata['session_logged_in'] ) ? mx_is_group_member($f_access_group['auth_moderator_group']) || $is_admin : 0; return $auth_user; *************** *** 314,323 **** case AUTH_ACL: ! $auth_user[$key] = ( $userdata['session_logged_in'] ) ? mx_auth_group($f_access_group) || $is_admin : 0; $auth_user[$key . '_type'] = $lang['Auth_Users_granted_access']; break; case AUTH_MOD: ! $auth_user[$key] = ( $userdata['session_logged_in'] ) ? mx_auth_group($f_access_group) || $is_admin : 0; $auth_user[$key . '_type'] = $lang['Auth_Moderators']; break; --- 312,321 ---- case AUTH_ACL: ! $auth_user[$key] = ( $userdata['session_logged_in'] ) ? mx_is_group_member($f_access_group) || $is_admin : 0; $auth_user[$key . '_type'] = $lang['Auth_Users_granted_access']; break; case AUTH_MOD: ! $auth_user[$key] = ( $userdata['session_logged_in'] ) ? mx_is_group_member($f_access_group) || $is_admin : 0; $auth_user[$key . '_type'] = $lang['Auth_Moderators']; break; *************** *** 336,341 **** // // Is user a moderator? ! // ! // $auth_user['auth_mod'] = ( $userdata['session_logged_in'] ) ? mx_auth_group($f_access_group) || $is_admin : 0; return $auth_user; --- 334,338 ---- // // Is user a moderator? ! // $auth_user['auth_mod'] = ( $userdata['session_logged_in'] ) ? mx_is_group_member($f_access_group) || $is_admin : 0; return $auth_user; *************** *** 401,405 **** | Also, adds all usergroups to userdata array \********************************************************************************/ ! function mx_auth_group($group_ids = '', $group_mod_mode = false) { global $userdata, $db; --- 398,402 ---- | Also, adds all usergroups to userdata array \********************************************************************************/ ! function mx_is_group_member($group_ids = '', $group_mod_mode = false) { global $userdata, $db; Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** mx_functions.php 29 Apr 2005 21:30:58 -0000 1.42 --- mx_functions.php 1 May 2005 16:02:12 -0000 1.43 *************** *** 1295,1297 **** --- 1295,1299 ---- } // class mx_request_vars + + ?> \ No newline at end of file |
