Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: MW <jo...@us...> - 2008-02-09 21:14:00
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16847/includes Modified Files: mx_functions_style.php Log Message: more use of request_vars wrapper class Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** mx_functions_style.php 8 Feb 2008 15:46:18 -0000 1.41 --- mx_functions_style.php 9 Feb 2008 21:13:56 -0000 1.42 *************** *** 754,758 **** if ( $this->data['user_id'] != ANONYMOUS && $this->data['user_style'] > 0 ) { ! $style = isset($_POST['user_style']) ? intval($_POST['user_style']) : $this->data['user_style']; if ( $theme = $this->_setup_style($style) ) { --- 754,758 ---- if ( $this->data['user_id'] != ANONYMOUS && $this->data['user_style'] > 0 ) { ! $style = $mx_request_vars->post('user_style', MX_TYPE_INT, $this->data['user_style']); if ( $theme = $this->_setup_style($style) ) { *************** *** 762,766 **** } ! $style = isset($_POST['default_style']) ? intval($_POST['default_style']) : $init_style; $theme = $this->_setup_style($style); --- 762,766 ---- } ! $style = $mx_request_vars->post('default_style', MX_TYPE_INT, $init_style); $theme = $this->_setup_style($style); |
|
From: MW <jo...@us...> - 2008-02-09 20:53:40
|
Update of /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8584/modules/mx_rebuild_search_tables/admin Modified Files: admin_rebuild_search.php admin_rebuild_mx_search.php Log Message: Dont trigger start time when just setmodules and fix call error of $mx_request_vars Index: admin_rebuild_mx_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/admin/admin_rebuild_mx_search.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_rebuild_mx_search.php 9 Feb 2008 12:50:23 -0000 1.10 --- admin_rebuild_mx_search.php 9 Feb 2008 20:53:36 -0000 1.11 *************** *** 10,18 **** */ - $start_time = time (); - $time_limit = $mx_request_vars->get('time_limit', MX_TYPE_NO_TAGS); - - define ('IN_PORTAL', 1); - if(!empty ($setmodules)) { --- 10,13 ---- *************** *** 22,25 **** --- 17,26 ---- } + global $mx_request_vars; + $start_time = time (); + $time_limit = $mx_request_vars->get('time_limit', MX_TYPE_INT); + + define ('IN_PORTAL', 1); + $no_page_header = true; $module_root_path = '../'; Index: admin_rebuild_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/admin/admin_rebuild_search.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_rebuild_search.php 9 Feb 2008 12:50:23 -0000 1.10 --- admin_rebuild_search.php 9 Feb 2008 20:53:36 -0000 1.11 *************** *** 10,18 **** */ - $start_time = time (); - $time_limit = $mx_request_vars->get('time_limit', MX_TYPE_INT); - - define ('IN_PORTAL', 1); - if(!empty ($setmodules)) { --- 10,13 ---- *************** *** 22,25 **** --- 17,26 ---- } + global $mx_request_vars; + $start_time = time (); + $time_limit = $mx_request_vars->get('time_limit', MX_TYPE_INT); + + define ('IN_PORTAL', 1); + $no_page_header = true; $module_root_path = '../'; |
|
From: MW <jo...@us...> - 2008-02-09 20:34:59
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv494/admin Modified Files: page_header_admin.php Log Message: removing extra comma (,) introduced in v 1.23 causing parse error. Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** page_header_admin.php 9 Feb 2008 19:45:35 -0000 1.24 --- page_header_admin.php 9 Feb 2008 20:34:54 -0000 1.25 *************** *** 82,86 **** 'S_CONTENT_ENCODING' => $lang['ENCODING'], 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], ! 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'],, 'S_USER_LANG' => $mx_user->lang['default_lang'], // --- 82,86 ---- 'S_CONTENT_ENCODING' => $lang['ENCODING'], 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], ! 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], 'S_USER_LANG' => $mx_user->lang['default_lang'], // |
|
From: MW <jo...@us...> - 2008-02-09 20:13:06
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23141/includes Modified Files: mx_functions_tools.php Log Message: $POST is already a global and doesn't need to be declared as one in local scope Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** mx_functions_tools.php 8 Feb 2008 23:35:57 -0000 1.19 --- mx_functions_tools.php 9 Feb 2008 20:13:01 -0000 1.20 *************** *** 2845,2849 **** function update_add_field( $field_type, $field_id = false ) { ! global $db, $db, $_POST, $lang; $field_name = ( isset( $_POST['field_name'] ) ) ? htmlspecialchars( $_POST['field_name'] ) : ''; --- 2845,2849 ---- function update_add_field( $field_type, $field_id = false ) { ! global $db, $lang; $field_name = ( isset( $_POST['field_name'] ) ) ? htmlspecialchars( $_POST['field_name'] ) : ''; *************** *** 2959,2963 **** function file_update_data( $file_id ) { ! global $_POST, $db; $field = ( isset( $_POST['field'] ) ) ? $_POST['field'] : ''; if ( !empty( $field ) ) --- 2959,2963 ---- function file_update_data( $file_id ) { ! global $db; $field = ( isset( $_POST['field'] ) ) ? $_POST['field'] : ''; if ( !empty( $field ) ) |
|
From: MW <jo...@us...> - 2008-02-09 19:49:11
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13217 Modified Files: common.php login.php Log Message: Upgrading old type $HTML_*_VARS Index: login.php =================================================================== RCS file: /cvsroot/mxbb/core/login.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** login.php 9 Feb 2008 12:52:36 -0000 1.26 --- login.php 9 Feb 2008 19:49:06 -0000 1.27 *************** *** 84,88 **** if ($mx_request_vars->is_request('redirect')) { ! $forward_to = $HTTP_SERVER_VARS['QUERY_STRING']; if( preg_match("/^redirect=([a-z0-9\.#\/\?&=\+\-_]+)/si", $forward_to, $forward_matches) ) --- 84,88 ---- if ($mx_request_vars->is_request('redirect')) { ! $forward_to = $_SERVER['QUERY_STRING']; if( preg_match("/^redirect=([a-z0-9\.#\/\?&=\+\-_]+)/si", $forward_to, $forward_matches) ) Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** common.php 9 Feb 2008 12:52:36 -0000 1.79 --- common.php 9 Feb 2008 19:49:06 -0000 1.80 *************** *** 412,416 **** // "clever" is doing harm rather than good ... karma is a great thing ... :) // ! $client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : getenv('REMOTE_ADDR') ); $user_ip = phpBB2::encode_ip($client_ip); --- 412,416 ---- // "clever" is doing harm rather than good ... karma is a great thing ... :) // ! $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : getenv('REMOTE_ADDR') ); $user_ip = phpBB2::encode_ip($client_ip); |
|
From: MW <jo...@us...> - 2008-02-09 19:47:21
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12473/modules/mx_phpbb2blocks Modified Files: mx_announce.php mx_forum.php mx_last_msg.php Log Message: Upgrading old type $HTML_*_VARS Index: mx_last_msg.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_last_msg.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_last_msg.php 9 Feb 2008 12:49:53 -0000 1.7 --- mx_last_msg.php 9 Feb 2008 19:47:17 -0000 1.8 *************** *** 245,254 **** if ( $userdata['session_logged_in'] ) { ! $tracking_topics = ( isset( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t'] ) ) ? unserialize( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"] ) : array(); ! $tracking_forums = ( isset( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f'] ) ) ? unserialize( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"] ) : array(); if ( $postrow[$row_count]['post_time'] > $userdata['user_lastvisit'] ) { ! if ( !empty( $tracking_topics ) || !empty( $tracking_forums ) || isset( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] ) ) { $unread_topics = true; --- 245,254 ---- if ( $userdata['session_logged_in'] ) { ! $tracking_topics = ( isset( $_COOKIE[$board_config['cookie_name'] . '_t'] ) ) ? unserialize( $_COOKIE[$board_config['cookie_name'] . "_t"] ) : array(); ! $tracking_forums = ( isset( $_COOKIE[$board_config['cookie_name'] . '_f'] ) ) ? unserialize( $_COOKIE[$board_config['cookie_name'] . "_f"] ) : array(); if ( $postrow[$row_count]['post_time'] > $userdata['user_lastvisit'] ) { ! if ( !empty( $tracking_topics ) || !empty( $tracking_forums ) || isset( $_COOKIE[$board_config['cookie_name'] . '_f_all'] ) ) { $unread_topics = true; *************** *** 270,276 **** } ! if ( isset( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] ) ) { ! if ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] >= $postrow[$row_count]['post_time'] ) { $unread_topics = false; --- 270,276 ---- } ! if ( isset( $_COOKIE[$board_config['cookie_name'] . '_f_all'] ) ) { ! if ( $_COOKIE[$board_config['cookie_name'] . '_f_all'] >= $postrow[$row_count]['post_time'] ) { $unread_topics = false; Index: mx_announce.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_announce.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mx_announce.php 9 Feb 2008 12:49:53 -0000 1.8 --- mx_announce.php 9 Feb 2008 19:47:17 -0000 1.9 *************** *** 233,237 **** if ( $postrow[$i]['last_post_time'] > $userdata['user_lastvisit'] ) { ! if ( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) { $unread_topics = true; --- 233,237 ---- if ( $postrow[$i]['last_post_time'] > $userdata['user_lastvisit'] ) { ! if ( !empty($tracking_topics) || !empty($tracking_forums) || isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) ) { $unread_topics = true; *************** *** 253,259 **** } ! if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) { ! if ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] >= $postrow[$i]['last_post_time'] ) { $unread_topics = false; --- 253,259 ---- } ! if ( isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) ) { ! if ( $_COOKIE[$board_config['cookie_name'] . '_f_all'] >= $postrow[$i]['last_post_time'] ) { $unread_topics = false; Index: mx_forum.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_forum.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_forum.php 9 Feb 2008 12:49:53 -0000 1.7 --- mx_forum.php 9 Feb 2008 19:47:17 -0000 1.8 *************** *** 65,70 **** // ! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array(); ! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array(); // --- 65,70 ---- // ! $tracking_topics = ( isset($_COOKIE[$board_config['cookie_name'] . '_t']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . "_t"]) : array(); ! $tracking_forums = ( isset($_COOKIE[$board_config['cookie_name'] . '_f']) ) ? unserialize($_COOKIE[$board_config['cookie_name'] . "_f"]) : array(); // *************** *** 393,399 **** } ! if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) { ! if ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $forum_last_post_time ) { $unread_topics = false; --- 393,399 ---- } ! if ( isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) ) { ! if ( $_COOKIE[$board_config['cookie_name'] . '_f_all'] > $forum_last_post_time ) { $unread_topics = false; |
|
From: MW <jo...@us...> - 2008-02-09 19:46:59
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12074/modules/mx_navmenu/admin Modified Files: mx_module_defs.php Log Message: Upgrading old type $HTML_*_VARS Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** mx_module_defs.php 9 Feb 2008 12:49:19 -0000 1.32 --- mx_module_defs.php 9 Feb 2008 19:46:55 -0000 1.33 *************** *** 82,86 **** function display_panel_nav_menu( $parameter_data, $block_id ) { ! global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $HTTP_COOKIE_VARS, $userdata, $mx_request_vars, $dynamic_block_id, $portalpage, $mx_cache, $phpEx; // --- 82,86 ---- function display_panel_nav_menu( $parameter_data, $block_id ) { ! global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $userdata, $mx_request_vars, $dynamic_block_id, $portalpage, $mx_cache, $phpEx; // *************** *** 95,99 **** // $cookie_tmp = $board_config['cookie_name'].'_admincp_menustates'; ! $cookie_states = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? explode(",", $HTTP_COOKIE_VARS[$cookie_tmp]) : array(); // --- 95,99 ---- // $cookie_tmp = $board_config['cookie_name'].'_admincp_menustates'; ! $cookie_states = !empty($_COOKIE[$cookie_tmp]) ? explode(",", $_COOKIE[$cookie_tmp]) : array(); // *************** *** 701,705 **** function display_panel_site_menu( $parameter_data, $block_id ) { ! global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $HTTP_COOKIE_VARS, $userdata, $mx_request_vars, $dynamic_block_id, $portalpage, $mx_cache, $phpEx; $mx_page = new mx_page(); --- 701,705 ---- function display_panel_site_menu( $parameter_data, $block_id ) { ! global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $userdata, $mx_request_vars, $dynamic_block_id, $portalpage, $mx_cache, $phpEx; $mx_page = new mx_page(); *************** *** 717,721 **** // $cookie_tmp = $board_config['cookie_name'].'_admincp_sitestates'; ! $cookie_states = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? explode(",", $HTTP_COOKIE_VARS[$cookie_tmp]) : array(); // --- 717,721 ---- // $cookie_tmp = $board_config['cookie_name'].'_admincp_sitestates'; ! $cookie_states = !empty($_COOKIE[$cookie_tmp]) ? explode(",", $_COOKIE[$cookie_tmp]) : array(); // |
|
From: MW <jo...@us...> - 2008-02-09 19:46:58
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12074/modules/mx_navmenu/includes Modified Files: navmenu_functions.php Log Message: Upgrading old type $HTML_*_VARS Index: navmenu_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/includes/navmenu_functions.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** navmenu_functions.php 6 Feb 2008 23:44:02 -0000 1.11 --- navmenu_functions.php 9 Feb 2008 19:46:55 -0000 1.12 *************** *** 342,346 **** { setcookie('mxNavCat_' . intval($block_id) . intval($page_data['page_id']), true, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); ! $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $page_data['page_id']] = 1; } --- 342,346 ---- { setcookie('mxNavCat_' . intval($block_id) . intval($page_data['page_id']), true, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); ! $_COOKIE['mxNavCat_' . $block_id . $page_data['page_id']] = 1; } *************** *** 348,352 **** // Generate the fold/unfold categories switches // ! $cat_on = $current_parent_page ? true : ( isset($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $page_data['page_id']]) ? $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $page_data['page_id']] == 1 : $catData[0]['cat_show'] == 1 ); $template->assign_block_vars('catrow', array( --- 348,352 ---- // Generate the fold/unfold categories switches // ! $cat_on = $current_parent_page ? true : ( isset($_COOKIE['mxNavCat_' . $block_id . $page_data['page_id']]) ? $_COOKIE['mxNavCat_' . $block_id . $page_data['page_id']] == 1 : $catData[0]['cat_show'] == 1 ); $template->assign_block_vars('catrow', array( |
|
From: MW <jo...@us...> - 2008-02-09 19:46:58
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12074/modules/mx_navmenu Modified Files: mx_menu_nav.php Log Message: Upgrading old type $HTML_*_VARS Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** mx_menu_nav.php 9 Feb 2008 12:49:19 -0000 1.29 --- mx_menu_nav.php 9 Feb 2008 19:46:55 -0000 1.30 *************** *** 194,198 **** { setcookie('mxNavCat_' . intval($block_id) . intval($cat_id), true, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); ! $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id] = 1; } --- 194,198 ---- { setcookie('mxNavCat_' . intval($block_id) . intval($cat_id), true, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); ! $_COOKIE['mxNavCat_' . $block_id . $cat_id] = 1; } *************** *** 200,205 **** // Generate the fold/unfold categories switches // ! //echo(intval($current_cat) . intval($hasCurrentMenu) . intval($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id])); ! $cat_on = $current_cat || $hasCurrentMenu ? true : ( isset($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id]) ? $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id] == 1 : $catData[0]['cat_show'] == 1 ); $style = $catData[0]['cat_url'] == $page_id && !$hasCurrentMenu ? 'cattitle' : 'genmed'; --- 200,205 ---- // Generate the fold/unfold categories switches // ! //echo(intval($current_cat) . intval($hasCurrentMenu) . intval($_COOKIE['mxNavCat_' . $block_id . $cat_id])); ! $cat_on = $current_cat || $hasCurrentMenu ? true : ( isset($_COOKIE['mxNavCat_' . $block_id . $cat_id]) ? $_COOKIE['mxNavCat_' . $block_id . $cat_id] == 1 : $catData[0]['cat_show'] == 1 ); $style = $catData[0]['cat_url'] == $page_id && !$hasCurrentMenu ? 'cattitle' : 'genmed'; |
|
From: MW <jo...@us...> - 2008-02-09 19:46:33
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12054/modules/mx_coreblocks Modified Files: mx_blockcp.php Log Message: Upgrading old type $HTML_*_VARS Index: mx_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** mx_blockcp.php 9 Feb 2008 12:48:51 -0000 1.21 --- mx_blockcp.php 9 Feb 2008 19:46:29 -0000 1.22 *************** *** 112,116 **** { $cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_block_id'; ! $block_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : 1; } else if ( empty($block_id) && $mx_request_vars->is_request('function_id') ) --- 112,116 ---- { $cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_block_id'; ! $block_id = !empty($_COOKIE[$cookie_tmp]) ? $_COOKIE[$cookie_tmp] : 1; } else if ( empty($block_id) && $mx_request_vars->is_request('function_id') ) |
|
From: MW <jo...@us...> - 2008-02-09 19:46:08
|
Update of /cvsroot/mxbb/core/install/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11661/install/includes Modified Files: functions_install.php Log Message: Upgrading old type $HTML_*_VARS Index: functions_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** functions_install.php 4 Feb 2008 15:58:08 -0000 1.5 --- functions_install.php 9 Feb 2008 19:46:04 -0000 1.6 *************** *** 654,658 **** function guess_lang() { ! global $mx_root_path, $HTTP_SERVER_VARS; // The order here _is_ important, at least for major_minor --- 654,658 ---- function guess_lang() { ! global $mx_root_path; // The order here _is_ important, at least for major_minor *************** *** 710,716 **** ); ! if (isset($HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'])) { ! $accept_lang_ary = explode(',', $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE']); for ($i = 0; $i < sizeof($accept_lang_ary); $i++) { --- 710,716 ---- ); ! if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { ! $accept_lang_ary = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']); for ($i = 0; $i < sizeof($accept_lang_ary); $i++) { |
|
From: MW <jo...@us...> - 2008-02-09 19:46:07
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11661/install Modified Files: mx_install.php Log Message: Upgrading old type $HTML_*_VARS Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** mx_install.php 9 Feb 2008 12:48:16 -0000 1.88 --- mx_install.php 9 Feb 2008 19:46:04 -0000 1.89 *************** *** 195,199 **** // Protect against GLOBALS tricks ! if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS'])) { die("Hacking attempt"); --- 195,199 ---- // Protect against GLOBALS tricks ! if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($_COOKIE['GLOBALS'])) { die("Hacking attempt"); *************** *** 480,484 **** $board_email = $mx_request_vars->post('board_email', MX_TYPE_NO_TAGS); ! $script_path = !$mx_request_vars->is_empty_post('script_path') ? $mx_request_vars->post('script_path', MX_TYPE_NO_TAGS) : str_replace('install', '', dirname($HTTP_SERVER_VARS['PHP_SELF'])); if (!$mx_request_vars->is_empty_post('server_name')) --- 480,484 ---- $board_email = $mx_request_vars->post('board_email', MX_TYPE_NO_TAGS); ! $script_path = !$mx_request_vars->is_empty_post('script_path') ? $mx_request_vars->post('script_path', MX_TYPE_NO_TAGS) : str_replace('install', '', dirname($_SERVER['PHP_SELF'])); if (!$mx_request_vars->is_empty_post('server_name')) *************** *** 489,499 **** { // Guess at some basic info used for install.. ! if (!empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME'])) { ! $server_name = (!empty($HTTP_SERVER_VARS['SERVER_NAME'])) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME']; } ! else if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST'])) { ! $server_name = (!empty($HTTP_SERVER_VARS['HTTP_HOST'])) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST']; } else --- 489,499 ---- { // Guess at some basic info used for install.. ! if (!empty($_SERVER['SERVER_NAME']) || !empty($_ENV['SERVER_NAME'])) { ! $server_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $_ENV['SERVER_NAME']; } ! else if (!empty($_SERVER['HTTP_HOST']) || !empty($_ENV['HTTP_HOST'])) { ! $server_name = (!empty($_SERVER['HTTP_HOST'])) ? $_SERVER['HTTP_HOST'] : $_ENV['HTTP_HOST']; } else *************** *** 509,515 **** else { ! if (!empty($HTTP_SERVER_VARS['SERVER_PORT']) || !empty($HTTP_ENV_VARS['SERVER_PORT'])) { ! $server_port = (!empty($HTTP_SERVER_VARS['SERVER_PORT'])) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $HTTP_ENV_VARS['SERVER_PORT']; } else --- 509,515 ---- else { ! if (!empty($_SERVER['SERVER_PORT']) || !empty($_ENV['SERVER_PORT'])) { ! $server_port = (!empty($_SERVER['SERVER_PORT'])) ? $_SERVER['SERVER_PORT'] : $_ENV['SERVER_PORT']; } else *************** *** 952,958 **** // Get the current document root. // ! if( isset($HTTP_SERVER_VARS['DOCUMENT_ROOT']) ) { ! $document_root = $HTTP_SERVER_VARS['DOCUMENT_ROOT']; } elseif( isset($DOCUMENT_ROOT) ) --- 952,958 ---- // Get the current document root. // ! if( isset($_SERVER['DOCUMENT_ROOT']) ) { ! $document_root = $_SERVER['DOCUMENT_ROOT']; } elseif( isset($DOCUMENT_ROOT) ) *************** *** 1034,1043 **** // Get the current Server URL. // ! $server_url = ( $HTTP_SERVER_VARS['SERVER_PORT'] == 443 ? 'https' : 'http' ) . '://' . $HTTP_SERVER_VARS['HTTP_HOST']; // // Get the MX-Publisher Path in the URL (this might not be the same as the base path when using aliases). // ! $mx_self_path = substr($HTTP_SERVER_VARS['PHP_SELF'], 0, -strlen('install/'.basename(__FILE__))); // --- 1034,1043 ---- // Get the current Server URL. // ! $server_url = ( $_SERVER['SERVER_PORT'] == 443 ? 'https' : 'http' ) . '://' . $_SERVER['HTTP_HOST']; // // Get the MX-Publisher Path in the URL (this might not be the same as the base path when using aliases). // ! $mx_self_path = substr($_SERVER['PHP_SELF'], 0, -strlen('install/'.basename(__FILE__))); // *************** *** 1055,1059 **** array('mxBB Root Path', $mx_base_path), array('Website URL', $server_url), ! array('PHP SELF', $HTTP_SERVER_VARS['PHP_SELF']), array('mxBB URL Path', $mx_self_path), array('Portal URL', $portal_url), --- 1055,1059 ---- array('mxBB Root Path', $mx_base_path), array('Website URL', $server_url), ! array('PHP SELF', $_SERVER['PHP_SELF']), array('mxBB URL Path', $mx_self_path), array('Portal URL', $portal_url), |
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11636/admin Modified Files: admin_mx_page_cp.php admin_mx_block_cp.php pagestart.php admin_mx_module.php page_header_admin.php admin_mx_module_cp.php Log Message: Upgrading old type $HTML_*_VARS Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** admin_mx_page_cp.php 4 Feb 2008 15:44:44 -0000 1.28 --- admin_mx_page_cp.php 9 Feb 2008 19:45:34 -0000 1.29 *************** *** 51,55 **** { $cookie_tmp = $board_config['cookie_name'].'_adminPage_page_id'; ! $nav_page_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : '1'; } --- 51,55 ---- { $cookie_tmp = $board_config['cookie_name'].'_adminPage_page_id'; ! $nav_page_id = !empty($_COOKIE[$cookie_tmp]) ? $_COOKIE[$cookie_tmp] : '1'; } *************** *** 89,93 **** // $cookie_tmp = $board_config['cookie_name'].'_admincp_pagestates'; ! $cookie_states = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? explode(",", $HTTP_COOKIE_VARS[$cookie_tmp]) : array(); // -------------------------------------------------------------------------------------------------------------------- --- 89,93 ---- // $cookie_tmp = $board_config['cookie_name'].'_admincp_pagestates'; ! $cookie_states = !empty($_COOKIE[$cookie_tmp]) ? explode(",", $_COOKIE[$cookie_tmp]) : array(); // -------------------------------------------------------------------------------------------------------------------- Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** admin_mx_module.php 9 Feb 2008 12:44:32 -0000 1.49 --- admin_mx_module.php 9 Feb 2008 19:45:34 -0000 1.50 *************** *** 49,53 **** { $cookie_tmp = $board_config['cookie_name'].'_adminModule_module_id'; ! $nav_module_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : ''; } --- 49,53 ---- { $cookie_tmp = $board_config['cookie_name'].'_adminModule_module_id'; ! $nav_module_id = !empty($_COOKIE[$cookie_tmp]) ? $_COOKIE[$cookie_tmp] : ''; } *************** *** 89,93 **** // $cookie_tmp = $board_config['cookie_name'].'_admincp_blockstates'; ! $cookie_states = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? explode(",", $HTTP_COOKIE_VARS[$cookie_tmp]) : array(); // -------------------------------------------------------------------------------------------------------------------- --- 89,93 ---- // $cookie_tmp = $board_config['cookie_name'].'_admincp_blockstates'; ! $cookie_states = !empty($_COOKIE[$cookie_tmp]) ? explode(",", $_COOKIE[$cookie_tmp]) : array(); // -------------------------------------------------------------------------------------------------------------------- Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** page_header_admin.php 9 Feb 2008 17:14:21 -0000 1.23 --- page_header_admin.php 9 Feb 2008 19:45:35 -0000 1.24 *************** *** 31,35 **** $phpver = phpversion(); ! $useragent = (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) --- 31,35 ---- $phpver = phpversion(); ! $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) *************** *** 43,47 **** else if ( $phpver > '4.0' ) { ! if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') ) { if ( extension_loaded('zlib') ) --- 43,47 ---- else if ( $phpver > '4.0' ) { ! if ( strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') ) { if ( extension_loaded('zlib') ) *************** *** 145,149 **** // Work around for "current" Apache 2 + PHP module which seems to not // cope with private cache control setting ! if (!empty($HTTP_SERVER_VARS['SERVER_SOFTWARE']) && strstr($HTTP_SERVER_VARS['SERVER_SOFTWARE'], 'Apache/2')) { header ('Cache-Control: no-cache, pre-check=0, post-check=0'); --- 145,149 ---- // Work around for "current" Apache 2 + PHP module which seems to not // cope with private cache control setting ! if (!empty($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache/2')) { header ('Cache-Control: no-cache, pre-check=0, post-check=0'); Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** admin_mx_module_cp.php 9 Feb 2008 12:44:32 -0000 1.21 --- admin_mx_module_cp.php 9 Feb 2008 19:45:35 -0000 1.22 *************** *** 44,48 **** { $cookie_tmp = $board_config['cookie_name'].'_adminModule_module_id'; ! $nav_module_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : ''; } --- 44,48 ---- { $cookie_tmp = $board_config['cookie_name'].'_adminModule_module_id'; ! $nav_module_id = !empty($_COOKIE[$cookie_tmp]) ? $_COOKIE[$cookie_tmp] : ''; } *************** *** 79,85 **** // $cookie_tmp = $board_config['cookie_name'].'_admincp_blockstates'; ! $cookie_states = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? explode(",", $HTTP_COOKIE_VARS[$cookie_tmp]) : array(); ! $sort_cookie = !empty($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) ? explode(",", $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) : array(); if ($mx_request_vars->is_post('include_block_quickedit')) --- 79,85 ---- // $cookie_tmp = $board_config['cookie_name'].'_admincp_blockstates'; ! $cookie_states = !empty($_COOKIE[$cookie_tmp]) ? explode(",", $_COOKIE[$cookie_tmp]) : array(); ! $sort_cookie = !empty($_COOKIE[$board_config['cookie_name'] . '_pagesort']) ? explode(",", $_COOKIE[$board_config['cookie_name'] . '_pagesort']) : array(); if ($mx_request_vars->is_post('include_block_quickedit')) Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** pagestart.php 9 Feb 2008 12:44:32 -0000 1.30 --- pagestart.php 9 Feb 2008 19:45:34 -0000 1.31 *************** *** 58,62 **** if ($mx_request_vars->get('sid', MX_TYPE_NO_TAGS) != $userdata['session_id'] ) { ! $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $HTTP_SERVER_VARS['REQUEST_URI']); $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path'])), '', $url); $url = str_replace('//', '/', $url); --- 58,62 ---- if ($mx_request_vars->get('sid', MX_TYPE_NO_TAGS) != $userdata['session_id'] ) { ! $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $_SERVER['REQUEST_URI']); $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path'])), '', $url); $url = str_replace('//', '/', $url); Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** admin_mx_block_cp.php 9 Feb 2008 12:44:32 -0000 1.19 --- admin_mx_block_cp.php 9 Feb 2008 19:45:34 -0000 1.20 *************** *** 89,93 **** { $cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_block_id'; ! $block_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : 1; } else if ( empty($block_id) && $mx_request_vars->is_request('function_id') ) --- 89,93 ---- { $cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_block_id'; ! $block_id = !empty($_COOKIE[$cookie_tmp]) ? $_COOKIE[$cookie_tmp] : 1; } else if ( empty($block_id) && $mx_request_vars->is_request('function_id') ) |
|
From: MW <jo...@us...> - 2008-02-09 19:44:14
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10803/includes Modified Files: mx_functions_core.php mx_functions_blockcp.php mx_functions.php page_header.php Log Message: Upgrading old type $HTML_*_VARS Index: mx_functions_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** mx_functions_blockcp.php 9 Feb 2008 12:37:24 -0000 1.24 --- mx_functions_blockcp.php 9 Feb 2008 19:44:11 -0000 1.25 *************** *** 62,66 **** function _controlpanel( $id, $new_block = false ) { ! global $blockcptemplate, $lang, $db, $board_config, $theme, $HTTP_COOKIE_VARS, $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; $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0; *************** *** 186,190 **** // $cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_mode'; ! $cookie_blockCP = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : 'settings'; // --- 186,190 ---- // $cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_mode'; ! $cookie_blockCP = !empty($_COOKIE[$cookie_tmp]) ? $_COOKIE[$cookie_tmp] : 'settings'; // Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** page_header.php 9 Feb 2008 12:37:24 -0000 1.51 --- page_header.php 9 Feb 2008 19:44:11 -0000 1.52 *************** *** 32,36 **** $phpver = phpversion(); ! $useragent = (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) --- 32,36 ---- $phpver = phpversion(); ! $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) *************** *** 44,48 **** else if ( $phpver > '4.0' ) { ! if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') ) { if ( extension_loaded('zlib') ) --- 44,48 ---- else if ( $phpver > '4.0' ) { ! if ( strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') ) { if ( extension_loaded('zlib') ) *************** *** 583,587 **** // Determine if user have gecko/opera browser // ! $useragent = (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( strstr($useragent, 'Gecko') ) { --- 583,587 ---- // Determine if user have gecko/opera browser // ! $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( strstr($useragent, 'Gecko') ) { *************** *** 637,645 **** // Add no-cache control for cookies if they are set ! //$c_no_cache = (isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_data'])) ? 'no-cache="set-cookie", ' : ''; // Work around for "current" Apache 2 + PHP module which seems to not // cope with private cache control setting ! if (!empty($HTTP_SERVER_VARS['SERVER_SOFTWARE']) && strstr($HTTP_SERVER_VARS['SERVER_SOFTWARE'], 'Apache/2')) { header ('Cache-Control: no-cache, pre-check=0, post-check=0'); --- 637,645 ---- // Add no-cache control for cookies if they are set ! //$c_no_cache = (isset($_COOKIE[$board_config['cookie_name'] . '_sid']) || isset($_COOKIE[$board_config['cookie_name'] . '_data'])) ? 'no-cache="set-cookie", ' : ''; // Work around for "current" Apache 2 + PHP module which seems to not // cope with private cache control setting ! if (!empty($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache/2')) { header ('Cache-Control: no-cache, pre-check=0, post-check=0'); Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** mx_functions_core.php 9 Feb 2008 19:32:55 -0000 1.69 --- mx_functions_core.php 9 Feb 2008 19:44:11 -0000 1.70 *************** *** 419,423 **** function _get_page_config( $id = '' ) { ! global $db, $HTTP_SESSION_VARS; $this->pages_config = array(); --- 419,423 ---- function _get_page_config( $id = '' ) { ! global $db; $this->pages_config = array(); *************** *** 542,546 **** function _update_cache( ) { ! global $db, $HTTP_SESSION_VARS, $mx_root_path, $phpbb_root_path, $phpEx, $mx_use_cache, $portal_config; $portal_cache_time = time(); --- 542,546 ---- function _update_cache( ) { ! global $db, $mx_root_path, $phpbb_root_path, $phpEx, $mx_use_cache, $portal_config; $portal_cache_time = time(); *************** *** 2869,2873 **** function _set_all() { ! global $userdata, $mx_root_path, $mx_request_vars, $HTTP_COOKIE_VARS, $portal_config, $theme, $lang; global $mx_block; --- 2869,2873 ---- function _set_all() { ! global $userdata, $mx_root_path, $mx_request_vars, $portal_config, $theme, $lang; global $mx_block; *************** *** 2922,2926 **** // Generate the fold/unfold menu navigation switches (cookie based) // ! $this->editcp_show = ( $userdata['user_level'] == ADMIN && isset($HTTP_COOKIE_VARS['editCP_switch']) ) ? $HTTP_COOKIE_VARS['editCP_switch'] == 1 : true; } --- 2922,2926 ---- // Generate the fold/unfold menu navigation switches (cookie based) // ! $this->editcp_show = ( $userdata['user_level'] == ADMIN && isset($_COOKIE['editCP_switch']) ) ? $_COOKIE['editCP_switch'] == 1 : true; } Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** mx_functions.php 9 Feb 2008 12:37:24 -0000 1.78 --- mx_functions.php 9 Feb 2008 19:44:11 -0000 1.79 *************** *** 445,452 **** function mx_url() { ! global $SID, $HTTP_SERVER_VARS; $numargs = func_num_args(); ! $url = $PHP_SELF . '?' . $HTTP_SERVER_VARS['QUERY_STRING']; $url = parse_url($url); --- 445,452 ---- function mx_url() { ! global $SID; $numargs = func_num_args(); ! $url = $PHP_SELF . '?' . $_SERVER['QUERY_STRING']; $url = parse_url($url); *************** *** 553,557 **** function mx_session_start() { ! global $board_config, $HTTP_SERVER_VARS, $do_gzip_compress; // --- 553,557 ---- function mx_session_start() { ! global $board_config, $do_gzip_compress; // *************** *** 579,583 **** $phpver = phpversion(); ! $useragent = (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) --- 579,583 ---- $phpver = phpversion(); ! $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) *************** *** 591,595 **** else if ( $phpver > '4.0' ) { ! if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') ) { if ( extension_loaded('zlib') ) --- 591,595 ---- else if ( $phpver > '4.0' ) { ! if ( strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') ) { if ( extension_loaded('zlib') ) |
|
From: MW <jo...@us...> - 2008-02-09 19:42:43
|
Update of /cvsroot/mxbb/core/includes/sessions/internal In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10350/includes/sessions/internal Modified Files: session.php Log Message: Upgrading old type $HTML_*_VARS Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/session.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** session.php 9 Feb 2008 12:41:11 -0000 1.5 --- session.php 9 Feb 2008 19:42:38 -0000 1.6 *************** *** 53,57 **** { global $db, $board_config; ! global $HTTP_COOKIE_VARS, $mx_request_vars, $SID; $cookiename = $board_config['cookie_name']; --- 53,57 ---- { global $db, $board_config; ! global $mx_request_vars, $SID; $cookiename = $board_config['cookie_name']; *************** *** 60,67 **** $cookiesecure = $board_config['cookie_secure']; ! if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ) { ! $session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : ''; ! $sessiondata = isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : array(); $sessionmethod = SESSION_METHOD_COOKIE; } --- 60,67 ---- $cookiesecure = $board_config['cookie_secure']; ! if ( isset($_COOKIE[$cookiename . '_sid']) || isset($_COOKIE[$cookiename . '_data']) ) { ! $session_id = isset($_COOKIE[$cookiename . '_sid']) ? $_COOKIE[$cookiename . '_sid'] : ''; ! $sessiondata = isset($_COOKIE[$cookiename . '_data']) ? unserialize(stripslashes($_COOKIE[$cookiename . '_data'])) : array(); $sessionmethod = SESSION_METHOD_COOKIE; } *************** *** 294,298 **** { global $db, $lang, $board_config; ! global $HTTP_COOKIE_VARS, $mx_request_vars, $SID; $cookiename = $board_config['cookie_name']; --- 294,298 ---- { global $db, $lang, $board_config; ! global $mx_request_vars, $SID; $cookiename = $board_config['cookie_name']; *************** *** 304,311 **** unset($userdata); ! if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ) { ! $sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename . '_data'] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : array(); ! $session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : ''; $sessionmethod = SESSION_METHOD_COOKIE; } --- 304,311 ---- unset($userdata); ! if ( isset($_COOKIE[$cookiename . '_sid']) || isset($_COOKIE[$cookiename . '_data']) ) { ! $sessiondata = isset( $_COOKIE[$cookiename . '_data'] ) ? unserialize(stripslashes($_COOKIE[$cookiename . '_data'])) : array(); ! $session_id = isset( $_COOKIE[$cookiename . '_sid'] ) ? $_COOKIE[$cookiename . '_sid'] : ''; $sessionmethod = SESSION_METHOD_COOKIE; } *************** *** 429,433 **** { global $db, $lang, $board_config, $userdata; ! global $HTTP_COOKIE_VARS, $SID; $cookiename = $board_config['cookie_name']; --- 429,433 ---- { global $db, $lang, $board_config, $userdata; ! global $SID; $cookiename = $board_config['cookie_name']; |
|
From: MW <jo...@us...> - 2008-02-09 19:42:43
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10350/includes/sessions/phpbb2 Modified Files: session.php Log Message: Upgrading old type $HTML_*_VARS Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/session.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** session.php 9 Feb 2008 17:14:33 -0000 1.4 --- session.php 9 Feb 2008 19:42:38 -0000 1.5 *************** *** 53,57 **** { global $db, $board_config; ! global $HTTP_COOKIE_VARS, $mx_request_vars, $SID; $cookiename = $board_config['cookie_name']; --- 53,57 ---- { global $db, $board_config; ! global $mx_request_vars, $SID; $cookiename = $board_config['cookie_name']; *************** *** 60,67 **** $cookiesecure = $board_config['cookie_secure']; ! if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ) { ! $session_id = isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : ''; ! $sessiondata = isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : array(); $sessionmethod = SESSION_METHOD_COOKIE; } --- 60,67 ---- $cookiesecure = $board_config['cookie_secure']; ! if ( isset($_COOKIE[$cookiename . '_sid']) || isset($_COOKIE[$cookiename . '_data']) ) { ! $session_id = isset($_COOKIE[$cookiename . '_sid']) ? $_COOKIE[$cookiename . '_sid'] : ''; ! $sessiondata = isset($_COOKIE[$cookiename . '_data']) ? unserialize(stripslashes($_COOKIE[$cookiename . '_data'])) : array(); $sessionmethod = SESSION_METHOD_COOKIE; } *************** *** 297,301 **** { global $db, $lang, $board_config; ! global $HTTP_COOKIE_VARS, $mx_request_vars, $SID; $cookiename = $board_config['cookie_name']; --- 297,301 ---- { global $db, $lang, $board_config; ! global $mx_request_vars, $SID; $cookiename = $board_config['cookie_name']; *************** *** 307,314 **** unset($userdata); ! if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ) { ! $sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename . '_data'] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : array(); ! $session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : ''; $sessionmethod = SESSION_METHOD_COOKIE; } --- 307,314 ---- unset($userdata); ! if ( isset($_COOKIE[$cookiename . '_sid']) || isset($_COOKIE[$cookiename . '_data']) ) { ! $sessiondata = isset( $_COOKIE[$cookiename . '_data'] ) ? unserialize(stripslashes($_COOKIE[$cookiename . '_data'])) : array(); ! $session_id = isset( $_COOKIE[$cookiename . '_sid'] ) ? $_COOKIE[$cookiename . '_sid'] : ''; $sessionmethod = SESSION_METHOD_COOKIE; } *************** *** 432,436 **** { global $db, $lang, $board_config, $userdata; ! global $HTTP_COOKIE_VARS, $SID; $cookiename = $board_config['cookie_name']; --- 432,436 ---- { global $db, $lang, $board_config, $userdata; ! global $SID; $cookiename = $board_config['cookie_name']; |
|
From: MW <jo...@us...> - 2008-02-09 19:32:59
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6145/includes Modified Files: mx_functions_core.php Log Message: Be explicite about what we return in wrapper request_vars class bool functions. Should be true:false really but don't think all code is ready to handle that Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** mx_functions_core.php 9 Feb 2008 12:34:09 -0000 1.68 --- mx_functions_core.php 9 Feb 2008 19:32:55 -0000 1.69 *************** *** 3750,3754 **** global $HTTP_POST_VARS; // Note: _x and _y are used by (at least IE) to return the mouse position at onclick of INPUT TYPE="img" elements. ! return ( isset($HTTP_POST_VARS[$var]) || ( isset($HTTP_POST_VARS[$var.'_x']) && isset($HTTP_POST_VARS[$var.'_y']) ) ); } --- 3750,3754 ---- global $HTTP_POST_VARS; // Note: _x and _y are used by (at least IE) to return the mouse position at onclick of INPUT TYPE="img" elements. ! return (isset($HTTP_POST_VARS[$var]) || ( isset($HTTP_POST_VARS[$var.'_x']) && isset($HTTP_POST_VARS[$var.'_y']))) ? 1 : 0; } *************** *** 3765,3769 **** { global $HTTP_GET_VARS; ! return ( isset($HTTP_GET_VARS[$var]) ); } --- 3765,3769 ---- { global $HTTP_GET_VARS; ! return isset($HTTP_GET_VARS[$var]) ? 1 : 0 ; } *************** *** 3779,3783 **** function is_request($var) { ! return ( $this->is_get($var) || $this->is_post($var) ); } /** --- 3779,3783 ---- function is_request($var) { ! return ($this->is_get($var) || $this->is_post($var)) ? 1 : 0; } /** *************** *** 3793,3802 **** function is_empty_post($var) { ! global $HTTP_POST_VARS; ! // Note: _x and _y are used by (at least IE) to return the mouse position at onclick of INPUT TYPE="img" elements. ! if ( isset($HTTP_POST_VARS[$var]) || ( isset($HTTP_POST_VARS[$var.'_x']) && isset($HTTP_POST_VARS[$var.'_y']))) { $tmp = $this->_read($var, MX_TYPE_POST_VARS); ! return empty($tmp); } return true; --- 3793,3800 ---- function is_empty_post($var) { ! if ( $this->is_post($var)) { $tmp = $this->_read($var, MX_TYPE_POST_VARS); ! return empty($tmp) ? 1 : 0; } return true; *************** *** 3814,3822 **** function is_empty_get($var) { ! global $HTTP_GET_VARS; ! if ( isset($HTTP_GET_VARS[$var]) ) { $tmp = $this->_read($var, MX_TYPE_GET_VARS); ! return empty($tmp); } return true; --- 3812,3819 ---- function is_empty_get($var) { ! if ($this->is_get($var)) { $tmp = $this->_read($var, MX_TYPE_GET_VARS); ! return empty($tmp) ? 1 : 0; } return true; *************** *** 3834,3841 **** function is_empty_request($var) { ! return ( $this->is_empty_get($var) && $this->is_empty_post($var) ); } - } // class mx_request_vars ?> \ No newline at end of file --- 3831,3837 ---- function is_empty_request($var) { ! return ($this->is_empty_get($var) && $this->is_empty_post($var)) ? 1 : 0; } } // class mx_request_vars ?> \ No newline at end of file |
|
From: OryNider <ory...@us...> - 2008-02-09 17:14:40
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6860 Modified Files: session.php Log Message: bug fixed Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/session.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** session.php 9 Feb 2008 12:41:11 -0000 1.3 --- session.php 9 Feb 2008 17:14:33 -0000 1.4 *************** *** 250,258 **** } ! if ( !$db->sql_query($sql) ) ! { ! mx_message_die(CRITICAL_ERROR, 'Error updating session key', '', __LINE__, __FILE__, $sql); ! } ! $sessiondata['autologinid'] = $auto_login_key; unset($auto_login_key); --- 250,263 ---- } ! if ( !$db->sql_query($sql) ) ! { ! $sql2 = 'UPDATE ' . SESSIONS_KEYS_TABLE . " ! SET last_login = $current_time ! WHERE key_id = '" . md5($sessiondata['autologinid']) . "'"; ! if ( !$db->sql_query($sql2) ) ! { ! mx_message_die(CRITICAL_ERROR, 'Error updating session key', '', __LINE__, __FILE__, $sql); ! } ! } $sessiondata['autologinid'] = $auto_login_key; unset($auto_login_key); |
|
From: OryNider <ory...@us...> - 2008-02-09 17:14:27
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6818 Modified Files: page_header_admin.php Log Message: bug fixed Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** page_header_admin.php 5 Feb 2008 14:51:27 -0000 1.22 --- page_header_admin.php 9 Feb 2008 17:14:21 -0000 1.23 *************** *** 82,87 **** 'S_CONTENT_ENCODING' => $lang['ENCODING'], 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], ! 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], ! // // These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file --- 82,87 ---- 'S_CONTENT_ENCODING' => $lang['ENCODING'], 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], ! 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'],, ! 'S_USER_LANG' => $mx_user->lang['default_lang'], // // These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file |
|
From: MW <jo...@us...> - 2008-02-09 12:52:40
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30412 Modified Files: common.php login.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: login.php =================================================================== RCS file: /cvsroot/mxbb/core/login.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** login.php 4 Feb 2008 16:03:02 -0000 1.25 --- login.php 9 Feb 2008 12:52:36 -0000 1.26 *************** *** 38,44 **** // session id check ! if (!empty($HTTP_POST_VARS['sid']) || !empty($HTTP_GET_VARS['sid'])) { ! $sid = (!empty($HTTP_POST_VARS['sid'])) ? $HTTP_POST_VARS['sid'] : $HTTP_GET_VARS['sid']; } else --- 38,44 ---- // session id check ! if (!$mx_request_vars->is_empty_request('sid')) { ! $sid = $mx_request_vars->request('sid', MX_TYPE_NO_TAGS); } else *************** *** 47,51 **** } ! if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($HTTP_POST_VARS['logout']) || isset($HTTP_GET_VARS['logout']) ) { --- 47,51 ---- } ! if($mx_request_vars->is_request('login') || $mx_request_vars->is_request('logout') ) { *************** *** 71,75 **** // user not already logged in // ! if( !$userdata['session_logged_in'] || (isset($HTTP_GET_VARS['admin']) && $userdata['session_logged_in'] && $userdata['user_level'] == ADMIN)) { $mx_page->page_title = $lang['Login']; --- 71,75 ---- // user not already logged in // ! if( !$userdata['session_logged_in'] || ($mx_request_vars->is_get('admin') && $userdata['session_logged_in'] && $userdata['user_level'] == ADMIN)) { $mx_page->page_title = $lang['Login']; *************** *** 82,86 **** $forward_page = ''; ! if( isset($HTTP_POST_VARS['redirect']) || isset($HTTP_GET_VARS['redirect']) ) { $forward_to = $HTTP_SERVER_VARS['QUERY_STRING']; --- 82,86 ---- $forward_page = ''; ! if ($mx_request_vars->is_request('redirect')) { $forward_to = $HTTP_SERVER_VARS['QUERY_STRING']; *************** *** 116,120 **** $s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />'; ! $s_hidden_fields .= (isset($HTTP_GET_VARS['admin'])) ? '<input type="hidden" name="admin" value="1" />' : ''; //mx_make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx); --- 116,120 ---- $s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />'; ! $s_hidden_fields .= $mx_request_vars->is_get('admin') ? '<input type="hidden" name="admin" value="1" />' : ''; //mx_make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx); *************** *** 123,127 **** 'USERNAME' => $username, ! 'L_ENTER_PASSWORD' => (isset($HTTP_GET_VARS['admin'])) ? $lang['Admin_reauthenticate'] : $lang['Enter_password'], 'L_SEND_PASSWORD' => $lang['Forgotten_password'], --- 123,127 ---- 'USERNAME' => $username, ! 'L_ENTER_PASSWORD' => $mx_request_vars->is_get('admin') ? $lang['Admin_reauthenticate'] : $lang['Enter_password'], 'L_SEND_PASSWORD' => $lang['Forgotten_password'], Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** common.php 7 Feb 2008 01:39:38 -0000 1.78 --- common.php 9 Feb 2008 12:52:36 -0000 1.79 *************** *** 26,33 **** //define( 'DEBUG', 1 ); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only. ! //error_reporting(E_ALL); //ini_set( 'display_errors', '1' ); ! error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.php'); // For nice error output // ================================================================================ --- 26,33 ---- //define( 'DEBUG', 1 ); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only. ! error_reporting(E_ALL & ~E_NOTICE); //ini_set( 'display_errors', '1' ); ! //error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! //include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.' . $phpEx); // For nice error output // ================================================================================ *************** *** 131,134 **** --- 131,135 ---- // PHP5 with register_long_arrays off? + /* if (@phpversion() >= '5.0.0' && (!@ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off')) { *************** *** 147,151 **** } } ! // Protect against GLOBALS tricks if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS'])) --- 148,152 ---- } } ! */ // Protect against GLOBALS tricks if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS'])) |
|
From: MW <jo...@us...> - 2008-02-09 12:52:00
|
Update of /cvsroot/mxbb/core/templates/_core/images In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29732/templates/_core/images Modified Files: index.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/images/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.php 4 Feb 2008 15:59:56 -0000 1.2 --- index.php 9 Feb 2008 12:51:55 -0000 1.3 *************** *** 72,76 **** // Generate relevant output // ! if( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'left' ) { include('./page_header_admin.'.$phpEx); --- 72,76 ---- // Generate relevant output // ! if ($mx_request_vars->is_get('pane') && $mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'left' ) { include('./page_header_admin.'.$phpEx); *************** *** 305,309 **** include('./page_footer_admin.'.$phpEx); } ! elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' ) { --- 305,309 ---- include('./page_footer_admin.'.$phpEx); } ! elseif ($mx_request_vars->is_get('pane') && $mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'right' ) { |
Update of /cvsroot/mxbb/core/modules/mx_users/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29297/modules/mx_users/admin Modified Files: admin_users.php admin_prune_user_posts.php admin_groups.php admin_groupcp.php admin_userlist.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: admin_groups.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_groups.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_groups.php 8 Feb 2008 23:37:06 -0000 1.3 --- admin_groups.php 9 Feb 2008 12:51:06 -0000 1.4 *************** *** 49,55 **** } ! if ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) ) { ! $group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]); } else --- 49,55 ---- } ! if ($mx_request_vars->is_request(POST_GROUPS_URL)) { ! $group_id = $mx_request_vars->request(POST_GROUPS_URL, MX_TYPE_INT); } else *************** *** 58,65 **** } ! if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) ) { ! $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; ! $mode = htmlspecialchars($mode); } else --- 58,64 ---- } ! if ($mx_request_vars->is_request('mode')) { ! $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS); } else *************** *** 68,72 **** } ! if ( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) ) { // --- 67,71 ---- } ! if ($mx_request_vars->is_post('edit') || $mx_request_vars->is_post('new')) { // *************** *** 77,81 **** ); ! if ( isset($HTTP_POST_VARS['edit']) ) { // --- 76,80 ---- ); ! if ($mx_request_vars->is_post('edit') ) { // *************** *** 113,117 **** } ! else if ( isset($HTTP_POST_VARS['new']) ) { $group_info = array ( --- 112,116 ---- } ! else if ($mx_request_vars->is_post('new') ) { $group_info = array ( *************** *** 163,167 **** 'L_GROUP_TITLE' => $lang['Group_administration'], ! 'L_GROUP_EDIT_DELETE' => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'], 'L_GROUP_NAME' => $lang['group_name'], 'L_GROUP_DESCRIPTION' => $lang['group_description'], --- 162,166 ---- 'L_GROUP_TITLE' => $lang['Group_administration'], ! 'L_GROUP_EDIT_DELETE' => $mx_request_vars->is_post('new') ? $lang['New_group'] : $lang['Edit_group'], 'L_GROUP_NAME' => $lang['group_name'], 'L_GROUP_DESCRIPTION' => $lang['group_description'], *************** *** 195,204 **** } ! else if ( isset($HTTP_POST_VARS['group_update']) ) { // // Ok, they are submitting a group, let's save the data based on if it's new or editing // ! if ( isset($HTTP_POST_VARS['group_delete']) ) { // --- 194,203 ---- } ! else if ($mx_request_vars->is_post('group_update') ) { // // Ok, they are submitting a group, let's save the data based on if it's new or editing // ! if ($mx_request_vars->is_post('group_delete') ) { // *************** *** 279,287 **** else { ! $group_type = isset($HTTP_POST_VARS['group_type']) ? intval($HTTP_POST_VARS['group_type']) : GROUP_OPEN; ! $group_name = isset($HTTP_POST_VARS['group_name']) ? htmlspecialchars(trim($HTTP_POST_VARS['group_name'])) : ''; ! $group_description = isset($HTTP_POST_VARS['group_description']) ? trim($HTTP_POST_VARS['group_description']) : ''; ! $group_moderator = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : ''; ! $delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? true : false; if ( $group_name == '' ) --- 278,286 ---- else { ! $group_type = $mx_request_vars->post('group_type', MX_TYPE_INT, GROUP_OPEN); ! $group_name = $mx_request_vars->post('group_name', MX_TYPE_NO_TAGS); ! $group_description = $mx_request_vars->post('group_description', MX_TYPE_NO_TAGS); ! $group_moderator = $mx_request_vars->post('username', MX_TYPE_NO_TAGS); ! $delete_old_moderator = $mx_request_vars->is_post('delete_old_moderator'); if ( $group_name == '' ) Index: admin_prune_user_posts.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_prune_user_posts.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_prune_user_posts.php 4 Feb 2008 18:53:12 -0000 1.2 --- admin_prune_user_posts.php 9 Feb 2008 12:51:06 -0000 1.3 *************** *** 50,54 **** // did they press the big red button? ! if( !isset($HTTP_POST_VARS['submit']) ) { // Set template name --- 50,54 ---- // did they press the big red button? ! if (!$mx_request_vars->is_post('submit')) { // Set template name *************** *** 295,299 **** // Figure out what users (criteria) are we pruning ! switch($HTTP_POST_VARS['prune_type']) { case 'user': --- 295,299 ---- // Figure out what users (criteria) are we pruning ! switch ($mx_request_vars->post('prune_type', MX_TYPE_NO_TAGS)) { case 'user': *************** *** 303,307 **** $sql = "SELECT user_id FROM ".USERS_TABLE." ! WHERE username = '".addslashes(trim($HTTP_POST_VARS['username']))."'"; $result = $db->sql_query($sql); --- 303,307 ---- $sql = "SELECT user_id FROM ".USERS_TABLE." ! WHERE username = '".addslashes($mx_request_vars->post('username', MX_TYPE_NO_TAGS))."'"; $result = $db->sql_query($sql); *************** *** 373,377 **** // Prune users in a specific group ! $group_id = intval($HTTP_POST_VARS['prune_group']); // Let's make sure the group exists --- 373,377 ---- // Prune users in a specific group ! $group_id = $mx_request_vars->post('prune_group', MX_TYPE_INT); // Let's make sure the group exists *************** *** 434,444 **** // Remove any whitespace ! $HTTP_POST_VARS['prune_ip'] = trim($HTTP_POST_VARS['prune_ip']); // Let's see if they entered a full valid IPv4 address ! if( preg_match('/^([0-9]{1,2}|[0-2][0-9]{0,2})(\.([0-9]{1,2}|[0-2][0-9]{0,2})){3}$/', $HTTP_POST_VARS['prune_ip']) ) { // Encode the ip into hexademicals ! $ip = phpBB2::encode_ip($HTTP_POST_VARS['prune_ip']); // Because we will be deleting based on IP's, we will store the encoded IP alone --- 434,444 ---- // Remove any whitespace ! $prune_ip = $mx_request_vars->post('prune_ip'); // Let's see if they entered a full valid IPv4 address ! if( preg_match('/^([0-9]{1,2}|[0-2][0-9]{0,2})(\.([0-9]{1,2}|[0-2][0-9]{0,2})){3}$/', $prune_ip) ) { // Encode the ip into hexademicals ! $ip = phpBB2::encode_ip($prune_ip); // Because we will be deleting based on IP's, we will store the encoded IP alone *************** *** 446,450 **** } // We will also support wildcards, is this an xxx.xxx.* address? ! else if( preg_match('/^([0-9]{1,2}|[0-2][0-9]{0,2})(\.([0-9]{1,2}|[0-2][0-9]{0,2})){0,2}\.\*/', $HTTP_POST_VARS['prune_ip']) ) { // Alright, now we do the ugly part, converting them to encoded ips --- 446,450 ---- } // We will also support wildcards, is this an xxx.xxx.* address? ! else if( preg_match('/^([0-9]{1,2}|[0-2][0-9]{0,2})(\.([0-9]{1,2}|[0-2][0-9]{0,2})){0,2}\.\*/', $prune_ip) ) { // Alright, now we do the ugly part, converting them to encoded ips *************** *** 455,459 **** // First we will split the IP into its quads ! $ip_split = explode('.', $HTTP_POST_VARS['prune_ip']); // Now we'll work with which type of wildcard we have --- 455,459 ---- // First we will split the IP into its quads ! $ip_split = explode('.', $prune_ip); // Now we'll work with which type of wildcard we have *************** *** 478,485 **** } // Lastly, let's see if they have a range in the last quad, like xxx.xxx.xxx.xxx - xxx.xxx.xxx.yyy ! else if( preg_match('/^([0-9]{1,2}|[0-2][0-9]{0,2})(\.([0-9]{1,2}|[0-2][0-9]{0,2})){3}(\s)*-(\s)*([0-9]{1,2}|[0-2][0-9]{0,2})(\.([0-9]{1,2}|[0-2][0-9]{0,2})){3}$/', $HTTP_POST_VARS['prune_ip']) ) { // We will split the two ranges ! $range = preg_split('/[-\s]+/', $HTTP_POST_VARS['prune_ip']); // This is where break the start and end ips into quads --- 478,485 ---- } // Lastly, let's see if they have a range in the last quad, like xxx.xxx.xxx.xxx - xxx.xxx.xxx.yyy ! else if( preg_match('/^([0-9]{1,2}|[0-2][0-9]{0,2})(\.([0-9]{1,2}|[0-2][0-9]{0,2})){3}(\s)*-(\s)*([0-9]{1,2}|[0-2][0-9]{0,2})(\.([0-9]{1,2}|[0-2][0-9]{0,2})){3}$/', $prune_ip) ) { // We will split the two ranges ! $range = preg_split('/[-\s]+/', $prune_ip); // This is where break the start and end ips into quads *************** *** 560,564 **** { // If we have to prune this forum ! if( $HTTP_POST_VARS['prune_forumid_'.$row['forum_id']] == 'true' ) { $forums_to_update[$row['forum_id']] = true; --- 560,564 ---- { // If we have to prune this forum ! if( $mx_request_vars->post('prune_forumid_'.$row['forum_id'], MX_TYPE_NO_TAGS) == 'true' ) { $forums_to_update[$row['forum_id']] = true; *************** *** 587,591 **** // (Exempts) // Are we going to prune stickies? ! if( $HTTP_POST_VARS['prune_stickies'] == 'true' ) { $where_sql .= ' AND t.topic_type <> '.POST_STICKY; --- 587,591 ---- // (Exempts) // Are we going to prune stickies? ! if ($mx_request_vars->post('prune_stickies', MX_TYPE_NO_TAGS) == 'true' ) { $where_sql .= ' AND t.topic_type <> '.POST_STICKY; *************** *** 593,597 **** // Are we going to prune announcements? ! if( $HTTP_POST_VARS['prune_announcements'] == 'true' ) { $where_sql .= ' AND t.topic_type <> '.POST_ANNOUNCE; --- 593,597 ---- // Are we going to prune announcements? ! if ($mx_request_vars->post('prune_announcements', MX_TYPE_NO_TAGS) == 'true') { $where_sql .= ' AND t.topic_type <> '.POST_ANNOUNCE; *************** *** 599,603 **** // How about open topics? ! if( $HTTP_POST_VARS['prune_open'] == 'true' ) { $where_sql .= ' AND t.topic_status <> '.TOPIC_UNLOCKED; --- 599,603 ---- // How about open topics? ! if ($mx_request_vars->post('prune_open', MX_TYPE_NO_TAGS) == 'true') { $where_sql .= ' AND t.topic_status <> '.TOPIC_UNLOCKED; *************** *** 605,609 **** // How about polls? ! if( $HTTP_POST_VARS['prune_polls'] == 'true' ) { $where_sql .= ' AND t.topic_vote <> 0'; --- 605,609 ---- // How about polls? ! if ($mx_request_vars->post('prune_polls', MX_TYPE_NO_TAGS) == 'true') { $where_sql .= ' AND t.topic_vote <> 0'; *************** *** 611,621 **** // Let's sort out dates now ! switch( $HTTP_POST_VARS['prune_date_type'] ) { // We are pruning before are certain amount of time case 'time': ! $time_value = intval($HTTP_POST_VARS['prune_time_value']); ! switch($HTTP_POST_VARS['prune_time_type']) { case 'seconds': --- 611,621 ---- // Let's sort out dates now ! switch ($mx_request_vars->post('prune_date_type', MX_TYPE_NO_TAGS)) { // We are pruning before are certain amount of time case 'time': ! $time_value = $mx_request_vars->post('prune_time_value', MX_TYPE_INT); ! switch ($mx_request_vars->post('prune_time_type', MX_TYPE_NO_TAGS)) { case 'seconds': *************** *** 636,640 **** // Are we pruning before or after this time? ! if( $HTTP_POST_VARS['prune_time_order'] == 'before' ) { $operator = '<'; --- 636,640 ---- // Are we pruning before or after this time? ! if ($mx_request_vars->post('prune_time_order', MX_TYPE_NO_TAGS) == 'before' ) { $operator = '<'; *************** *** 648,652 **** break; case 'by_date': ! $date = trim($HTTP_POST_VARS['prune_dateby_value']); // Is this a valid dd/mm/yyyy (note year is limited from 1970 - 2038 (Current 4 bit unix timestamp limits) --- 648,652 ---- break; case 'by_date': ! $date = $mx_request_vars->post('prune_dateby_value', MX_TYPE_NO_TAGS); // Is this a valid dd/mm/yyyy (note year is limited from 1970 - 2038 (Current 4 bit unix timestamp limits) *************** *** 672,680 **** // Are we pruning before or after this date? ! if( $HTTP_POST_VARS['prune_dateby_type'] == 'before' ) { $operator = '<'; } ! else if( $HTTP_POST_VARS['prune_dateby_type'] == 'after' ) { $operator = '>'; --- 672,680 ---- // Are we pruning before or after this date? ! if ($mx_request_vars->post('prune_dateby_type', MX_TYPE_NO_TAGS) == 'before' ) { $operator = '<'; } ! else if ($mx_request_vars->post('prune_dateby_type', MX_TYPE_NO_TAGS) == 'after' ) { $operator = '>'; *************** *** 694,699 **** case 'range': // from dd/mm/yyyy to dd/mm/yyyy ! $start_range = trim($HTTP_POST_VARS['prune_daterange_start']); ! $end_range = trim($HTTP_POST_VARS['prune_daterange_stop']); // Is this a valid dd/mm/yyyy (note year is limited from 1970 - 2038 (Current 4 bit unix timestamp limits) --- 694,699 ---- case 'range': // from dd/mm/yyyy to dd/mm/yyyy ! $start_range = $mx_request_vars->post('prune_daterange_start', MX_TYPE_NO_TAGS); ! $end_range = $mx_request_vars->post('prune_daterange_stop', MX_TYPE_NO_TAGS); // Is this a valid dd/mm/yyyy (note year is limited from 1970 - 2038 (Current 4 bit unix timestamp limits) *************** *** 869,873 **** // If we are to delete topics by this guy/gal/it ! if($HTTP_POST_VARS['prune_topic_started'] == 'true') { $delete_this_topic = true; --- 869,873 ---- // If we are to delete topics by this guy/gal/it ! if ($mx_request_vars->post('prune_topic_started', MX_TYPE_NO_TAGS) == 'true') { $delete_this_topic = true; *************** *** 955,959 **** // If we're going to update the search tables ! if( $HTTP_POST_VARS['prune_update_search'] == 'true' ) { remove_search_post($post_ids_sql); --- 955,959 ---- // If we're going to update the search tables ! if ($mx_request_vars->post('prune_update_search', MX_TYPE_NO_TAGS) == 'true' ) { remove_search_post($post_ids_sql); *************** *** 1232,1236 **** // Update user post counts if we need to ! if( $HTTP_POST_VARS['prune_update_post_counts'] == 'true' ) { foreach( $users_post_counts as $user_id => $post_count ) --- 1232,1236 ---- // Update user post counts if we need to ! if ($mx_request_vars->post('prune_update_post_counts', MX_TYPE_NO_TAGS) == 'true' ) { foreach( $users_post_counts as $user_id => $post_count ) Index: admin_groupcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_groupcp.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_groupcp.php 30 Jan 2008 09:11:00 -0000 1.3 --- admin_groupcp.php 9 Feb 2008 12:51:07 -0000 1.4 *************** *** 135,141 **** // -------------------------- ! if ( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) { ! $group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]); } else --- 135,141 ---- // -------------------------- ! if ($mx_request_vars->is_request(POST_GROUPS_URL)) { ! $group_id = $mx_request_vars->request(POST_GROUPS_URL, MX_TYPE_NO_TAGS); } else *************** *** 144,151 **** } ! if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) ) { ! $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; ! $mode = htmlspecialchars($mode); } else --- 144,150 ---- } ! if ($mx_request_vars->is_request('mode')) { ! $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS); } else *************** *** 154,161 **** } ! $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : 0; ! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : 0; ! $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; // --- 153,160 ---- } ! $confirm = $mx_request_vars->is_post('confirm'); ! $cancel = $mx_request_vars->is_post('cancel'); ! $start = $mx_request_vars->get('start', MX_TYPE_INT, 0); // *************** *** 164,168 **** $is_moderator = FALSE; ! if ( isset($HTTP_POST_VARS['groupstatus']) && $group_id ) { if ( !$userdata['session_logged_in'] ) --- 163,167 ---- $is_moderator = FALSE; ! if ($mx_request_vars->is_post('groupstatus') && $group_id ) { if ( !$userdata['session_logged_in'] ) *************** *** 193,197 **** $sql = "UPDATE " . GROUPS_TABLE . " ! SET group_type = " . intval($HTTP_POST_VARS['group_type']) . " WHERE group_id = $group_id"; if ( !($result = $db->sql_query($sql)) ) --- 192,196 ---- $sql = "UPDATE " . GROUPS_TABLE . " ! SET group_type = " . $mx_request_vars->post('group_type', MX_TYPE_INT) . " WHERE group_id = $group_id"; if ( !($result = $db->sql_query($sql)) ) *************** *** 209,213 **** } ! else if ( isset($HTTP_POST_VARS['joingroup']) && $group_id ) { // --- 208,212 ---- } ! else if ($mx_request_vars->is_post('joingroup') && $group_id ) { // *************** *** 312,316 **** mx_message_die(GENERAL_MESSAGE, $message); } ! else if ( isset($HTTP_POST_VARS['unsub']) || isset($HTTP_POST_VARS['unsubpending']) && $group_id ) { // --- 311,315 ---- mx_message_die(GENERAL_MESSAGE, $message); } ! else if ($mx_request_vars->is_post('unsub') || $mx_request_vars->is_post('unsubpending') && $group_id ) { // *************** *** 373,377 **** else { ! $unsub_msg = ( isset($HTTP_POST_VARS['unsub']) ) ? $lang['Confirm_unsub'] : $lang['Confirm_unsub_pending']; $s_hidden_fields = '<input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" /><input type="hidden" name="unsub" value="1" />'; --- 372,376 ---- else { ! $unsub_msg = $mx_request_vars->is_post('unsub') ? $lang['Confirm_unsub'] : $lang['Confirm_unsub_pending']; $s_hidden_fields = '<input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" /><input type="hidden" name="unsub" value="1" />'; *************** *** 405,409 **** // If so, check to see if they are logged in. // ! if ( isset($HTTP_GET_VARS['validate']) ) { if ( !$userdata['session_logged_in'] ) --- 404,408 ---- // If so, check to see if they are logged in. // ! if ($mx_request_vars->is_get('validate') ) { if ( !$userdata['session_logged_in'] ) *************** *** 473,477 **** // Handle Additions, removals, approvals and denials // ! if ( !empty($HTTP_POST_VARS['add']) || !empty($HTTP_POST_VARS['remove']) || isset($HTTP_POST_VARS['approve']) || isset($HTTP_POST_VARS['deny']) ) { if ( !$userdata['session_logged_in'] ) --- 472,476 ---- // Handle Additions, removals, approvals and denials // ! if (!$mx_request_vars->is_empty_post('add') || !$mx_request_vars->is_empty_post('remove') || $mx_request_vars->is_post('approve') || $mx_request_vars->is_post('deny')) { if ( !$userdata['session_logged_in'] ) *************** *** 491,497 **** } ! if ( isset($HTTP_POST_VARS['add']) ) { ! $username = ( isset($HTTP_POST_VARS['username']) ) ? phpBB2::phpbb_clean_username($HTTP_POST_VARS['username']) : ''; $sql = "SELECT * --- 490,496 ---- } ! if ($mx_request_vars->is_post('add')) { ! $username = $mx_request_vars->is_post('username') ? phpBB2::phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS)) : ''; $sql = "SELECT * *************** *** 606,613 **** else { ! if ( ( ( isset($HTTP_POST_VARS['approve']) || isset($HTTP_POST_VARS['deny']) ) && isset($HTTP_POST_VARS['pending_members']) ) || ( isset($HTTP_POST_VARS['remove']) && isset($HTTP_POST_VARS['members']) ) ) { ! $members = ( isset($HTTP_POST_VARS['approve']) || isset($HTTP_POST_VARS['deny']) ) ? $HTTP_POST_VARS['pending_members'] : $HTTP_POST_VARS['members']; $sql_in = ''; --- 605,612 ---- else { ! if ( ( ($mx_request_vars->is_post('approve') || $mx_request_vars->is_post('deny') ) && $mx_request_vars->is_post('pending_members') ) || ( $mx_request_vars->is_post('remove') && $mx_request_vars->is_post('members') ) ) { ! $members = ($mx_request_vars->is_post('approve') || $mx_request_vars->is_post('deny')) ? $mx_request_vars->post('pending_members', MX_TYPE_NO_TAGS) : $mx_request_vars->post('members', MX_TYPE_NO_TAGS); $sql_in = ''; *************** *** 617,621 **** } ! if ( isset($HTTP_POST_VARS['approve']) ) { if ( $group_info['auth_mod'] ) --- 616,620 ---- } ! if ($mx_request_vars->is_post('approve')) { if ( $group_info['auth_mod'] ) *************** *** 639,643 **** WHERE user_id IN ($sql_in)"; } ! else if ( isset($HTTP_POST_VARS['deny']) || isset($HTTP_POST_VARS['remove']) ) { if ( $group_info['auth_mod'] ) --- 638,642 ---- WHERE user_id IN ($sql_in)"; } ! else if ($mx_request_vars->is_post('deny') || $mx_request_vars->is_post('remove') ) { if ( $group_info['auth_mod'] ) *************** *** 701,705 **** // Email users when they are approved // ! if ( isset($HTTP_POST_VARS['approve']) ) { if ( !($result = $db->sql_query($sql_select)) ) --- 700,704 ---- // Email users when they are approved // ! if ($mx_request_vars->is_post('approve') ) { if ( !($result = $db->sql_query($sql_select)) ) Index: admin_users.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_users.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_users.php 25 Jan 2008 11:37:45 -0000 1.5 --- admin_users.php 9 Feb 2008 12:51:06 -0000 1.6 *************** *** 59,66 **** // Set mode // ! if( isset( $HTTP_POST_VARS['mode'] ) || isset( $HTTP_GET_VARS['mode'] ) ) { ! $mode = ( isset( $HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; ! $mode = htmlspecialchars($mode); } else --- 59,65 ---- // Set mode // ! if ($mx_request_vars->is_request('mode')) { ! $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS); } else *************** *** 69,85 **** } ! $action = (isset($HTTP_POST_VARS['id'])) && !empty($HTTP_POST_VARS['id']) ? 'do_update' : 'do_add'; // // Begin program // ! if ( $mode == 'edit' || $mode == 'add' || $mode == 'save' && ( isset($HTTP_GET_VARS['username']) || isset($HTTP_POST_VARS['username']) ) ) { // // Ok, the profile has been modified and submitted, let's update // ! if ( ( $mode == 'save' && isset( $HTTP_POST_VARS['submit'] ) ) ) { ! $user_id = intval($HTTP_POST_VARS['id']); $this_userdata = mx_get_userdata($user_id); --- 68,84 ---- } ! $action = !$mx_request_vars->is_empty_post('id') ? 'do_update' : 'do_add'; // // Begin program // ! if ( $mode == 'edit' || $mode == 'add' || $mode == 'save' && $mx_request_vars->is_request('username')) { // // Ok, the profile has been modified and submitted, let's update // ! if ($mode == 'save' && $mx_request_vars->is_post('submit') ) { ! $user_id = $mx_request_vars->post('id', MX_TYPE_INT); $this_userdata = mx_get_userdata($user_id); *************** *** 90,94 **** } ! if( $HTTP_POST_VARS['deleteuser'] && ( $userdata['user_id'] != $user_id ) ) { switch (PORTAL_BACKEND) --- 89,93 ---- } ! if ($mx_request_vars->is_post('deleteuser') && $userdata['user_id'] != $user_id) { switch (PORTAL_BACKEND) *************** *** 273,287 **** } ! $username = ( !empty($HTTP_POST_VARS['username']) ) ? phpBB2::phpbb_clean_username($HTTP_POST_VARS['username']) : ''; ! $email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['email'] ) )) : ''; ! $password = ( !empty($HTTP_POST_VARS['password']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['password'] ) )) : ''; ! $password_confirm = ( !empty($HTTP_POST_VARS['password_confirm']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['password_confirm'] ) )) : ''; ! $user_status = ( !empty($HTTP_POST_VARS['user_status']) ) ? intval( $HTTP_POST_VARS['user_status'] ) : 0; } ! if( isset( $HTTP_POST_VARS['submit'] ) ) { $error = FALSE; --- 272,286 ---- } ! $username = phpBB2::phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS)); ! $email = $mx_request_vars->post('email', MX_TYPE_NO_TAGS); ! $password = $mx_request_vars->post('password', MX_TYPE_NO_TAGS); ! $password_confirm = $mx_request_vars->post('password_confirm', MX_TYPE_NO_TAGS); ! $user_status = $mx_request_vars->post('user_status', MX_TYPE_INT, 0); } ! if ($mx_request_vars->is_post('submit')) { $error = FALSE; *************** *** 450,460 **** // SHOW USER // ! else if( !isset( $HTTP_POST_VARS['submit'] ) && $mode != 'save' ) { if ($mode == 'edit') { ! if( isset( $HTTP_GET_VARS[POST_USERS_URL]) || isset( $HTTP_POST_VARS[POST_USERS_URL]) ) { ! $user_id = ( isset( $HTTP_POST_VARS[POST_USERS_URL]) ) ? intval( $HTTP_POST_VARS[POST_USERS_URL]) : intval( $HTTP_GET_VARS[POST_USERS_URL]); $this_userdata = mx_get_userdata($user_id); if( !$this_userdata ) --- 449,459 ---- // SHOW USER // ! else if ( !$mx_request_vars->post('submit') && $mode != 'save' ) { if ($mode == 'edit') { ! if ($mx_request_vars->is_request(POST_USERS_URL)) { ! $user_id = $mx_request_vars->request(POST_USERS_URL, MX_TYPE_INT); $this_userdata = mx_get_userdata($user_id); if( !$this_userdata ) *************** *** 465,470 **** else { ! //$this_userdata = mx_get_userdata($HTTP_POST_VARS['username'], true); ! $this_userdata = mx_get_userdata($HTTP_GET_VARS['username'], true); if( !$this_userdata ) { --- 464,468 ---- else { ! $this_userdata = mx_get_userdata($mx_request_vars->get('username', MX_TYPE_NO_TAGS), true); if( !$this_userdata ) { Index: admin_userlist.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_userlist.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_userlist.php 4 Feb 2008 18:53:12 -0000 1.2 --- admin_userlist.php 9 Feb 2008 12:51:07 -0000 1.3 *************** *** 41,47 **** // Set mode // ! if( isset( $HTTP_POST_VARS['mode'] ) || isset( $HTTP_GET_VARS['mode'] ) ) { ! $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; } else --- 41,47 ---- // Set mode // ! if ($mx_request_vars->is_request('mode')) { ! $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS); } else *************** *** 53,57 **** // confirm // ! if( isset( $HTTP_POST_VARS['confirm'] ) || isset( $HTTP_GET_VARS['confirm'] ) ) { $confirm = true; --- 53,57 ---- // confirm // ! if ($mx_request_vars->is_request('confirm')) { $confirm = true; *************** *** 65,69 **** // cancel // ! if( isset( $HTTP_POST_VARS['cancel'] ) || isset( $HTTP_GET_VARS['cancel'] ) ) { $cancel = true; --- 65,69 ---- // cancel // ! if ($mx_request_vars->is_request('cancel')) { $cancel = true; *************** *** 78,89 **** // get starting position // ! $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; // // get show amount // ! if ( isset($HTTP_GET_VARS['show']) || isset($HTTP_POST_VARS['show']) ) { ! $show = ( isset($HTTP_POST_VARS['show']) ) ? intval($HTTP_POST_VARS['show']) : intval($HTTP_GET_VARS['show']); } else --- 78,89 ---- // get starting position // ! $start = $mx_request_vars->get('start', MX_TYPE_INT, 0); // // get show amount // ! if ($mx_request_vars->is_request('show')) { ! $show = $mx_request_vars->request('show', MX_TYPE_INT, 0); } else *************** *** 95,101 **** // sort method // ! if ( isset($HTTP_GET_VARS['sort']) || isset($HTTP_POST_VARS['sort']) ) { ! $sort = ( isset($HTTP_POST_VARS['sort']) ) ? htmlspecialchars($HTTP_POST_VARS['sort']) : htmlspecialchars($HTTP_GET_VARS['sort']); $sort = str_replace("\'", "''", $sort); } --- 95,101 ---- // sort method // ! if ($mx_request_vars->is_request('sort')) { ! $sort = $mx_request_vars->request('sort', MX_TYPE_NO_TAGS); $sort = str_replace("\'", "''", $sort); } *************** *** 108,118 **** // sort order // ! if( isset($HTTP_POST_VARS['order']) ) ! { ! $sort_order = ( $HTTP_POST_VARS['order'] == 'ASC' ) ? 'ASC' : 'DESC'; ! } ! else if( isset($HTTP_GET_VARS['order']) ) { ! $sort_order = ( $HTTP_GET_VARS['order'] == 'ASC' ) ? 'ASC' : 'DESC'; } else --- 108,114 ---- // sort order // ! if ($mx_request_vars->is_request('order')) { ! $sort_order = $mx_request_vars->request('order', MX_TYPE_NO_TAGS) == 'ASC' ? 'ASC' : 'DESC'; } else *************** *** 124,130 **** // alphanumeric stuff // ! if ( isset($HTTP_GET_VARS['alphanum']) || isset($HTTP_POST_VARS['alphanum']) ) { ! $alphanum = ( isset($HTTP_POST_VARS['alphanum']) ) ? htmlspecialchars($HTTP_POST_VARS['alphanum']) : htmlspecialchars($HTTP_GET_VARS['alphanum']); $alphanum = str_replace("\'", "''", $alphanum); switch( $dbms ) --- 120,126 ---- // alphanumeric stuff // ! if ($mx_request_vars->is_request('alphanum')) { ! $alphanum = $mx_request_vars->request('alphanum', MX_TYPE_NO_HTML); $alphanum = str_replace("\'", "''", $alphanum); switch( $dbms ) *************** *** 151,157 **** // because it is an array we will intval() it when we use it // ! if ( isset($HTTP_POST_VARS[POST_USERS_URL]) || isset($HTTP_GET_VARS[POST_USERS_URL]) ) { ! $user_ids = ( isset($HTTP_POST_VARS[POST_USERS_URL]) ) ? $HTTP_POST_VARS[POST_USERS_URL] : $HTTP_GET_VARS[POST_USERS_URL]; } else --- 147,153 ---- // because it is an array we will intval() it when we use it // ! if ($mx_request_vars->is_request(POST_USERS_URL)) { ! $user_ids = $mx_request_vars->request(POST_USERS_URL); } else *************** *** 556,560 **** { // add the users to the selected group ! $group_id = intval($HTTP_POST_VARS[POST_GROUPS_URL]); include($phpbb_root_path . 'includes/emailer.'.$phpEx); --- 552,556 ---- { // add the users to the selected group ! $group_id = $mx_request_vars->post(POST_GROUPS_URL, MX_TYPE_INT); include($phpbb_root_path . 'includes/emailer.'.$phpEx); *************** *** 943,947 **** // $template->assign_block_vars('user_row', array( ! 'ROW_NUMBER' => $i + ( $HTTP_GET_VARS['start'] + 1 ), 'ROW_CLASS' => ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'], --- 939,943 ---- // $template->assign_block_vars('user_row', array( ! 'ROW_NUMBER' => $i + ($mx_request_vars->get('start', MX_TYPE_INT) + 1 ), 'ROW_CLASS' => ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'], |
|
From: MW <jo...@us...> - 2008-02-09 12:50:46
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29268/modules/mx_textblocks Modified Files: mx_textblock_multi.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: mx_textblock_multi.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_multi.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mx_textblock_multi.php 4 Feb 2008 16:55:12 -0000 1.22 --- mx_textblock_multi.php 9 Feb 2008 12:50:41 -0000 1.23 *************** *** 101,105 **** )); ! $xtra_dynamic = isset($HTTP_GET_VARS['dynamic_block']) ? '&dynamic_block=' . $HTTP_GET_VARS['dynamic_block'] : ''; // --- 101,105 ---- )); ! $xtra_dynamic = $mx_request_vars->is_get('dynamic_block') ? '&dynamic_block=' . $mx_request_vars->get('dynamic_block', MX_TYPE_NO_TAGS) : ''; // |
|
From: MW <jo...@us...> - 2008-02-09 12:50:45
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29268/modules/mx_textblocks/admin Modified Files: mx_module_defs.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** mx_module_defs.php 4 Feb 2008 16:55:13 -0000 1.27 --- mx_module_defs.php 9 Feb 2008 12:50:41 -0000 1.28 *************** *** 50,57 **** function submit_module_parameters( $parameter_data, $block_id ) { ! global $HTTP_POST_VARS, $db, $board_config, $mx_cache, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx; global $html_entities_match, $html_entities_replace; ! $parameter_value = $HTTP_POST_VARS[$parameter_data['parameter_name']]; $parameter_opt = ''; --- 50,57 ---- function submit_module_parameters( $parameter_data, $block_id ) { ! global $mx_request_vars, $db, $board_config, $mx_cache, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx; global $html_entities_match, $html_entities_replace; ! $parameter_value = $mx_request_vars->post($parameter_data['parameter_name']); $parameter_opt = ''; *************** *** 65,72 **** break; case 'CustomizedTextBlock': ! $bbcode_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_bbcode']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_bbcode']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_bbcode']['parameter_value'] == 'TRUE'; ! $html_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_html']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_html']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_html']['parameter_value'] == 'TRUE'; ! $smilies_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_smilies']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_smilies']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_smilies']['parameter_value'] == 'TRUE'; ! $board_config['allow_html_tags'] = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['html_tags']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['html_tags']['parameter_id']] : $mx_blockcp->block_parameters['html_tags']['parameter_value']; break; --- 65,72 ---- break; case 'CustomizedTextBlock': ! $bbcode_on = $mx_request_vars->is_post($mx_blockcp->block_parameters['allow_bbcode']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['allow_bbcode']['parameter_id'], MX_TYPE_NO_TAGS) == 'TRUE' : $mx_blockcp->block_parameters['allow_bbcode']['parameter_value'] == 'TRUE'; ! $html_on = $mx_request_vars->is_post($mx_blockcp->block_parameters['allow_html']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['allow_html']['parameter_id'], MX_TYPE_NO_TAGS) == 'TRUE' : $mx_blockcp->block_parameters['allow_html']['parameter_value'] == 'TRUE'; ! $smilies_on = $mx_request_vars->is_post($mx_blockcp->block_parameters['allow_smilies']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['allow_smilies']['parameter_id'], MX_TYPE_NO_TAGS) == 'TRUE' : $mx_blockcp->block_parameters['allow_smilies']['parameter_value'] == 'TRUE'; ! $board_config['allow_html_tags'] = $mx_request_vars->is_post($mx_blockcp->block_parameters['html_tags']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['html_tags']['parameter_id'], MX_TYPE_NO_TAGS) : $mx_blockcp->block_parameters['html_tags']['parameter_value']; break; *************** *** 132,139 **** { global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx, $mx_table_prefix, $table_prefix; ! global $HTTP_POST_VARS; ! $parameter_value = isset($HTTP_POST_VARS['preview']) ? $HTTP_POST_VARS[$parameter_data['parameter_name']] : $parameter_data['parameter_value']; ! $bbcode_uid = isset($HTTP_POST_VARS['preview']) ? '' : $parameter_data['parameter_opt']; // --- 132,139 ---- { global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx, $mx_table_prefix, $table_prefix; ! global $mx_request_vars; ! $parameter_value = $mx_request_vars->is_post('preview') ? $mx_request_vars->post($parameter_data['parameter_name'], MX_TYPE_NO_TAGS) : $parameter_data['parameter_value']; ! $bbcode_uid = $mx_request_vars->is_post('preview') ? '' : $parameter_data['parameter_opt']; // *************** *** 151,155 **** $mx_text->init($html_on, $bbcode_on, $smilies_on); ! if ( isset($HTTP_POST_VARS['preview']) ) { // --- 151,155 ---- $mx_text->init($html_on, $bbcode_on, $smilies_on); ! if ($mx_request_vars->is_post('preview')) { // *************** *** 268,282 **** { global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx, $mx_table_prefix, $table_prefix, $html_entities_match, $html_entities_replace; ! global $HTTP_POST_VARS; ! $parameter_value = isset($HTTP_POST_VARS['preview']) ? $HTTP_POST_VARS[$parameter_data['parameter_name']] : $parameter_data['parameter_value']; ! $bbcode_uid = isset($HTTP_POST_VARS['preview']) ? '' : $parameter_data['parameter_opt']; // // Toggles ????????????????? // ! $bbcode_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_bbcode']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_bbcode']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_bbcode']['parameter_value'] == 'TRUE'; ! $html_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_html']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_html']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_html']['parameter_value'] == 'TRUE'; ! $smilies_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_smilies']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_smilies']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_smilies']['parameter_value'] == 'TRUE'; // --- 268,282 ---- { global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx, $mx_table_prefix, $table_prefix, $html_entities_match, $html_entities_replace; ! global $mx_request_vars; ! $parameter_value = $mx_request_vars->is_post('preview') ? $mx_request_vars->post($parameter_data['parameter_name'], MX_TYPE_NO_TAGS) : $parameter_data['parameter_value']; ! $bbcode_uid = $mx_request_vars->is_post('preview') ? '' : $parameter_data['parameter_opt']; // // Toggles ????????????????? // ! $bbcode_on = $mx_request_vars->is_post($mx_blockcp->block_parameters['allow_bbcode']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['allow_bbcode']['parameter_id'], MX_TYPE_NO_TAGS) == 'TRUE' : $mx_blockcp->block_parameters['allow_bbcode']['parameter_value'] == 'TRUE'; ! $html_on = $mx_request_vars->is_post($mx_blockcp->block_parameters['allow_html']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['allow_html']['parameter_id'], MX_TYPE_NO_TAGS) == 'TRUE' : $mx_blockcp->block_parameters['allow_html']['parameter_value'] == 'TRUE'; ! $smilies_on = $mx_request_vars->is_post($mx_blockcp->block_parameters['allow_smilies']['parameter_id']) ? $mx_request_vars->post($mx_blockcp->block_parameters['allow_smilies']['parameter_id'], MX_TYPE_NO_TAGS) == 'TRUE' : $mx_blockcp->block_parameters['allow_smilies']['parameter_value'] == 'TRUE'; // *************** *** 287,291 **** $mx_text->init($html_on, $bbcode_on, $smilies_on); ! if ( isset($HTTP_POST_VARS['preview']) ) { // --- 287,291 ---- $mx_text->init($html_on, $bbcode_on, $smilies_on); ! if ($mx_request_vars->is_post('preview')) { // *************** *** 402,409 **** { global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx, $mx_table_prefix, $table_prefix, $html_entities_match, $html_entities_replace; ! global $HTTP_POST_VARS; ! $parameter_value = isset($HTTP_POST_VARS['preview']) ? $HTTP_POST_VARS[$parameter_data['parameter_name']] : $parameter_data['parameter_value']; ! $bbcode_uid = isset($HTTP_POST_VARS['preview']) ? '' : $parameter_data['parameter_opt']; // --- 402,409 ---- { global $template, $board_config, $db, $theme, $lang, $images, $mx_blockcp, $mx_root_path, $phpbb_root_path, $phpEx, $mx_table_prefix, $table_prefix, $html_entities_match, $html_entities_replace; ! global $mx_request_vars; ! $parameter_value = $mx_request_vars->is_post('preview') ? $mx_request_vars->post($parameter_data['parameter_name'], MX_TYPE_NO_TAGS) : $parameter_data['parameter_value']; ! $bbcode_uid = $mx_request_vars->is_post('preview') ? '' : $parameter_data['parameter_opt']; // *************** *** 427,431 **** $mx_text->allow_all_html_tags = true; ! if ( isset($HTTP_POST_VARS['preview']) ) { // --- 427,431 ---- $mx_text->allow_all_html_tags = true; ! if ($mx_request_vars->is_post('preview')) { // |
|
From: MW <jo...@us...> - 2008-02-09 12:50:27
|
Update of /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29246/modules/mx_rebuild_search_tables/admin Modified Files: admin_rebuild_search.php admin_rebuild_mx_search.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: admin_rebuild_mx_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/admin/admin_rebuild_mx_search.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** admin_rebuild_mx_search.php 4 Feb 2008 16:54:25 -0000 1.9 --- admin_rebuild_mx_search.php 9 Feb 2008 12:50:23 -0000 1.10 *************** *** 11,15 **** $start_time = time (); ! $time_limit = $HTTP_GET_VARS['time_limit']; define ('IN_PORTAL', 1); --- 11,15 ---- $start_time = time (); ! $time_limit = $mx_request_vars->get('time_limit', MX_TYPE_NO_TAGS); define ('IN_PORTAL', 1); *************** *** 43,47 **** $page_title = $lang['Page_title']; ! if (isset ($HTTP_GET_VARS['start'])) { function onTime () --- 43,47 ---- $page_title = $lang['Page_title']; ! if ($mx_request_vars->is_get('start')) { function onTime () *************** *** 65,69 **** } ! $start = $HTTP_GET_VARS['start']; if ($start == 0) --- 65,69 ---- } ! $start = $mx_request_vars->get('start', MX_TYPE_INT); if ($start == 0) *************** *** 104,108 **** } ! $total_num_rows = (isset ($HTTP_GET_VARS['total_num_rows'])) ? $HTTP_GET_VARS['total_num_rows'] : $total_num_rows; // --- 104,108 ---- } ! $total_num_rows = $mx_request_vars->get('total_num_rows', MX_TYPE_INT, $total_num_rows); // *************** *** 119,123 **** OR par.parameter_type = 'WysiwygTextBlock' ) AND sys.sub_id = 0 ! LIMIT ".$start.", ". $HTTP_GET_VARS['post_limit']; /* --- 119,123 ---- OR par.parameter_type = 'WysiwygTextBlock' ) AND sys.sub_id = 0 ! LIMIT ".$start.", ". $mx_request_vars->get('post_limit', MX_TYPE_INT); /* *************** *** 144,151 **** if (($start + $num_rows) != $total_num_rows) { ! $form_action = append_sid ("admin_rebuild_mx_search.$phpEx?start=". ($start + $num_rows) ."&total_num_rows=$total_num_rows&post_limit=". $HTTP_GET_VARS['post_limit'] ."&time_limit=$time_limit&refresh_rate=". $HTTP_GET_VARS['refresh_rate']); $next = $lang['Next']; $template->assign_vars(array( ! "META" => '<meta http-equiv="refresh" content="'. $HTTP_GET_VARS['refresh_rate'] .';url='. $form_action .'">') ); } --- 144,151 ---- if (($start + $num_rows) != $total_num_rows) { ! $form_action = append_sid ("admin_rebuild_mx_search.$phpEx?start=". ($start + $num_rows) ."&total_num_rows=$total_num_rows&post_limit=". $mx_request_vars->get('post_limit', MX_TYPE_INT) ."&time_limit=$time_limit&refresh_rate=". $mx_request_vars->get('refresh_rate', MX_TYPE_INT)); $next = $lang['Next']; $template->assign_vars(array( ! "META" => '<meta http-equiv="refresh" content="'. $mx_request_vars->get('refresh_rate', MX_TYPE_INT) .';url='. $form_action .'">') ); } Index: admin_rebuild_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/admin/admin_rebuild_search.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** admin_rebuild_search.php 4 Feb 2008 16:54:25 -0000 1.9 --- admin_rebuild_search.php 9 Feb 2008 12:50:23 -0000 1.10 *************** *** 11,15 **** $start_time = time (); ! $time_limit = $HTTP_GET_VARS['time_limit']; define ('IN_PORTAL', 1); --- 11,15 ---- $start_time = time (); ! $time_limit = $mx_request_vars->get('time_limit', MX_TYPE_INT); define ('IN_PORTAL', 1); *************** *** 43,47 **** $page_title = $lang['Page_title']; ! if (isset ($HTTP_GET_VARS['start'])) { function onTime () --- 43,47 ---- $page_title = $lang['Page_title']; ! if ($mx_request_vars->is_get('start')) { function onTime () *************** *** 65,69 **** } ! $start = $HTTP_GET_VARS['start']; if ($start == 0) --- 65,69 ---- } ! $start = $mx_request_vars->get('start', MX_TYPE_INT); if ($start == 0) *************** *** 88,94 **** } ! $total_num_rows = (isset ($HTTP_GET_VARS['total_num_rows'])) ? $HTTP_GET_VARS['total_num_rows'] : $total_num_rows; ! $sql = "SELECT post_id, post_subject, post_text FROM ". POSTS_TEXT_TABLE ." LIMIT $start, ". $HTTP_GET_VARS['post_limit']; if ( !$result = $db->sql_query ($sql) ) --- 88,94 ---- } ! $total_num_rows = $mx_request_vars->get('total_num_rows', MX_TYPE_INT, $total_num_rows); ! $sql = "SELECT post_id, post_subject, post_text FROM ". POSTS_TEXT_TABLE ." LIMIT $start, ". $mx_request_vars->get('post_limit', MX_TYPE_INT); if ( !$result = $db->sql_query ($sql) ) *************** *** 111,118 **** if (($start + $num_rows) != $total_num_rows) { ! $form_action = append_sid ("admin_rebuild_search.$phpEx?start=". ($start + $num_rows) ."&total_num_rows=$total_num_rows&post_limit=". $HTTP_GET_VARS['post_limit'] ."&time_limit=$time_limit&refresh_rate=". $HTTP_GET_VARS['refresh_rate']); $next = $lang['Next']; $template->assign_vars(array( ! "META" => '<meta http-equiv="refresh" content="'. $HTTP_GET_VARS['refresh_rate'] .';url='. $form_action .'">') ); } --- 111,118 ---- if (($start + $num_rows) != $total_num_rows) { ! $form_action = append_sid ("admin_rebuild_search.$phpEx?start=". ($start + $num_rows) ."&total_num_rows=$total_num_rows&post_limit=". $mx_request_vars->get('post_limit',MX_TYPE_INT) ."&time_limit=$time_limit&refresh_rate=". $mx_request_vars->get('refresh_rate', MX_TYPE_INT)); $next = $lang['Next']; $template->assign_vars(array( ! "META" => '<meta http-equiv="refresh" content="'. $mx_request_vars->get('refresh_rate', MX_TYPE_INT) .';url='. $form_action .'">') ); } |
2 messages has been excluded from this view by a project administrator.
