Menu
▾
▴
[mxbb-commits] core/modules/mx_coreblocks mx_announce.php,1.16,1.17 mx_forum.php,1.9,1.10 mx_google.php,1.7,1.8 mx_includex.php,1.6,1.7 mx_language.php,1.12,1.13 mx_login.php,1.8,1.9 mx_online.php,1.10,1.11 mx_poll.php,1.23,1.24 mx_site_log.php,1.4,1.5 mx_theme.php,1.12,1.13
|
From: Jon O. <jon...@us...> - 2005-10-23 18:48:33
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21549/modules/mx_coreblocks Modified Files: mx_announce.php mx_forum.php mx_google.php mx_includex.php mx_language.php mx_login.php mx_online.php mx_poll.php mx_site_log.php mx_theme.php Log Message: Updated all core blocks to use the new $mx_block->get_parameters() api, instead of old red_block_config() function Index: mx_poll.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_poll.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mx_poll.php 1 Oct 2005 14:10:45 -0000 1.23 --- mx_poll.php 23 Oct 2005 18:48:21 -0000 1.24 *************** *** 19,23 **** */ ! if( !defined('IN_PORTAL') ) { die("Hacking attempt"); --- 19,23 ---- */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { die("Hacking attempt"); *************** *** 31,38 **** // -------------------------------------------------------------------------------- ! $block_config = read_block_config($block_id); ! $title = $block_config[$block_id]['block_title']; ! $topic_id = $block_config[$block_id]['Poll_Display']['parameter_value']; ! $forum_lst_poll = $block_config[$block_id]['poll_forum']['parameter_value']; $auth_data_sql_poll = get_auth_forum(); --- 31,42 ---- // -------------------------------------------------------------------------------- ! // ! // Read Block Settings ! // ! $title = $mx_block->block_info['block_title']; ! $message = $mx_block->get_parameters( 'Text' ); ! ! $topic_id = $mx_block->get_parameters( 'Poll_Display' ); ! $forum_lst_poll = $mx_block->get_parameters( 'poll_forum' ); $auth_data_sql_poll = get_auth_forum(); Index: mx_forum.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_forum.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mx_forum.php 1 Oct 2005 14:10:45 -0000 1.9 --- mx_forum.php 23 Oct 2005 18:48:21 -0000 1.10 *************** *** 19,34 **** */ ! if ( !defined('IN_PORTAL') ) { ! define('IN_PORTAL', 1); ! $mx_root_path = '../../'; ! ! $include_page_tail = 1; ! ! include($mx_root_path . 'extension.inc'); ! include($mx_root_path . 'common.' . $phpEx); ! ! $userdata = session_pagestart($user_ip, PAGE_FORUM); ! mx_init_userprefs($userdata); } --- 19,25 ---- */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { ! die("Hacking attempt"); } Index: mx_online.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_online.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mx_online.php 1 Oct 2005 14:10:45 -0000 1.10 --- mx_online.php 23 Oct 2005 18:48:21 -0000 1.11 *************** *** 19,28 **** */ ! if( !defined('IN_PORTAL') ) { die("Hacking attempt"); } - // ================================================================================ // The following code is backported from includes/page_header.php (phpBB 2.0.13) --- 19,27 ---- */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { die("Hacking attempt"); } // ================================================================================ // The following code is backported from includes/page_header.php (phpBB 2.0.13) Index: mx_login.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_login.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mx_login.php 1 Oct 2005 14:10:45 -0000 1.8 --- mx_login.php 23 Oct 2005 18:48:21 -0000 1.9 *************** *** 19,23 **** */ ! if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); --- 19,23 ---- */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { die("Hacking attempt"); Index: mx_language.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_language.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mx_language.php 1 Oct 2005 14:10:45 -0000 1.12 --- mx_language.php 23 Oct 2005 18:48:21 -0000 1.13 *************** *** 19,23 **** */ ! if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); --- 19,23 ---- */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { die("Hacking attempt"); Index: mx_google.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_google.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_google.php 1 Oct 2005 14:10:45 -0000 1.7 --- mx_google.php 23 Oct 2005 18:48:21 -0000 1.8 *************** *** 19,23 **** */ ! if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); --- 19,23 ---- */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { die("Hacking attempt"); Index: mx_site_log.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_site_log.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_site_log.php 1 Oct 2005 14:10:45 -0000 1.4 --- mx_site_log.php 23 Oct 2005 18:48:21 -0000 1.5 *************** *** 18,24 **** * (at your option) any later version. */ ! $block_config = read_block_config( $block_id ); ! $title = $block_config[$block_id]['block_title']; $block_size = ( !empty( $block_size ) ? $block_size : '100%' ); --- 18,32 ---- * (at your option) any later version. */ + + if( !defined('IN_PORTAL') || !is_object($mx_block)) + { + die("Hacking attempt"); + } ! // ! // Read Block Settings ! // ! $title = $mx_block->block_info['block_title']; ! $message = $mx_block->get_parameters( 'Text' ); $block_size = ( !empty( $block_size ) ? $block_size : '100%' ); *************** *** 28,33 **** // Read block Configuration ! $log_numberOfEvents = $block_config[$block_id]['numOfEvents']['parameter_value'] > 0 ? intval( $block_config[$block_id]['numOfEvents']['parameter_value']) : '5'; ! $log_filter_time = $block_config[$block_id]['log_filter_date']['parameter_value']; // no limit, last day, 2 days, 3 days, week, 2 weeks, 3 weeks, month, 2 months, 3 months, 6 months, i year, $log_start = ( isset( $HTTP_GET_VARS['log_start'] ) ) ? intval( $HTTP_GET_VARS['log_start'] ) : 0; --- 36,41 ---- // Read block Configuration ! $log_numberOfEvents = $mx_block->get_parameters( 'numOfEvents' ) > 0 ? intval( $mx_block->get_parameters( 'numOfEvents' ) ) : '5'; ! $log_filter_time = $mx_block->get_parameters( 'log_filter_date' ); // no limit, last day, 2 days, 3 days, week, 2 weeks, 3 weeks, month, 2 months, 3 months, 6 months, i year, $log_start = ( isset( $HTTP_GET_VARS['log_start'] ) ) ? intval( $HTTP_GET_VARS['log_start'] ) : 0; Index: mx_includex.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_includex.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_includex.php 1 Oct 2005 14:10:45 -0000 1.6 --- mx_includex.php 23 Oct 2005 18:48:21 -0000 1.7 *************** *** 19,42 **** */ ! if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); } ! $block_config = read_block_config($block_id); ! $title = $block_config[$block_id]['block_title']; $select_row = array('x_listen', 'x_iframe', 'x_textfile', 'x_multimedia', 'x_pic', 'x_format'); ! $iframe_mode = $select_row[$block_config[$block_id]['x_mode']['parameter_value']]; $x_mode = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_mode']) ? $HTTP_GET_VARS['x_mode'] : $iframe_mode ); ! $x_1 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_1']) ? $HTTP_GET_VARS['x_1'] : $block_config[$block_id]['x_1']['parameter_value'] ); ! $x_2 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_2']) ? $HTTP_GET_VARS['x_2'] : $block_config[$block_id]['x_2']['parameter_value'] ); ! $x_3 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_3']) ? $HTTP_GET_VARS['x_3'] : $block_config[$block_id]['x_3']['parameter_value'] ); // Start output of page ! $template->set_filenames(array( 'includex_block' => 'mx_includex.tpl') --- 19,45 ---- */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { die("Hacking attempt"); } ! // ! // Read Block Settings ! // ! $title = $mx_block->block_info['block_title']; $select_row = array('x_listen', 'x_iframe', 'x_textfile', 'x_multimedia', 'x_pic', 'x_format'); ! $iframe_mode = $select_row[$mx_block->get_parameters( 'x_mode' )]; $x_mode = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_mode']) ? $HTTP_GET_VARS['x_mode'] : $iframe_mode ); ! $x_1 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_1']) ? $HTTP_GET_VARS['x_1'] : $mx_block->get_parameters( 'x_1' ) ); ! $x_2 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_2']) ? $HTTP_GET_VARS['x_2'] : $mx_block->get_parameters( 'x_2' ) ); ! $x_3 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_3']) ? $HTTP_GET_VARS['x_3'] : $mx_block->get_parameters( 'x_3' ) ); + // // Start output of page ! // $template->set_filenames(array( 'includex_block' => 'mx_includex.tpl') Index: mx_announce.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_announce.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** mx_announce.php 1 Oct 2005 14:10:45 -0000 1.16 --- mx_announce.php 23 Oct 2005 18:48:20 -0000 1.17 *************** *** 19,39 **** */ // ! // Read block Configuration // ! $block_config = read_block_config($block_id); ! $title = $block_config[$block_id]['block_title']; ! $announce_nbr_display = $block_config[$block_id]['announce_nbr_display']['parameter_value']; ! $announce_nbr_days = $block_config[$block_id]['announce_nbr_days']['parameter_value']; ! $announce_display_global = $block_config[$block_id]['announce_display_global']['parameter_value']; ! $announce_display = $block_config[$block_id]['announce_display']['parameter_value']; ! $announce_display_sticky = $block_config[$block_id]['announce_display_sticky']['parameter_value']; ! $announce_display_normal = $block_config[$block_id]['announce_display_normal']['parameter_value']; ! $announce_img_global = $block_config[$block_id]['announce_img_global']['parameter_value']; ! $announce_img = $block_config[$block_id]['announce_img']['parameter_value']; ! $announce_img_sticky = $block_config[$block_id]['announce_img_sticky']['parameter_value']; ! $announce_img_normal = $block_config[$block_id]['announce_img_normal']['parameter_value']; ! $announce_forum = $block_config[$block_id]['announce_forum']['parameter_value']; if ( empty($announce_nbr_display) ) $announce_nbr_display = 10; --- 19,43 ---- */ + if( !defined('IN_PORTAL') || !is_object($mx_block)) + { + die("Hacking attempt"); + } + // ! // Read Block Settings // ! $title = $mx_block->block_info['block_title']; ! $announce_nbr_display = $mx_block->get_parameters( 'announce_nbr_display' ); ! $announce_nbr_days = $mx_block->get_parameters( 'announce_nbr_days' ); ! $announce_display_global = $mx_block->get_parameters( 'announce_display_global' ); ! $announce_display = $mx_block->get_parameters( 'announce_display' ); ! $announce_display_sticky = $mx_block->get_parameters( 'announce_display_sticky' ); ! $announce_display_normal = $mx_block->get_parameters( 'announce_display_normal' ); ! $announce_img_global = $mx_block->get_parameters( 'announce_img_global' ); ! $announce_img = $mx_block->get_parameters( 'announce_img' ); ! $announce_img_sticky = $mx_block->get_parameters( 'announce_img_sticky' ); ! $announce_img_normal = $mx_block->get_parameters( 'announce_img_normal' ); ! $announce_forum = $mx_block->get_parameters( 'announce_forum' ); if ( empty($announce_nbr_display) ) $announce_nbr_display = 10; Index: mx_theme.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_theme.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mx_theme.php 1 Oct 2005 14:10:45 -0000 1.12 --- mx_theme.php 23 Oct 2005 18:48:21 -0000 1.13 *************** *** 19,23 **** */ ! if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); --- 19,23 ---- */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { die("Hacking attempt"); |
