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 12:49:57
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28808/modules/mx_phpbb2blocks Modified Files: mx_poll.php mx_announce.php mx_forum.php mx_last_msg.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: mx_poll.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_poll.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_poll.php 4 Feb 2008 16:53:19 -0000 1.5 --- mx_poll.php 9 Feb 2008 12:49:53 -0000 1.6 *************** *** 79,85 **** // Vote in a poll // ! if ( !empty($HTTP_POST_VARS[$vote_id_name]) ) { ! $vote_option_id = intval($HTTP_POST_VARS[$vote_id_name]); $sql = "SELECT vd.vote_id --- 79,85 ---- // Vote in a poll // ! if ( !$mx_request_vars->is_empty_post($vote_id_name)) { ! $vote_option_id = $mx_request_vars->post($vote_id_name, MX_TYPE_INT); $sql = "SELECT vd.vote_id *************** *** 194,200 **** $db->sql_freeresult($result); ! if ( ( isset($HTTP_GET_VARS['vote']) || isset($HTTP_POST_VARS['vote']) ) || ( !$userdata['session_logged_in'] ) ) { ! $view_result = ( ( ( ( isset($HTTP_GET_VARS['vote']) ) ? $HTTP_GET_VARS['vote'] : $HTTP_POST_VARS['vote'] ) == 'viewresult' ) || ( !$userdata['session_logged_in'] ) ) ? TRUE : 0; } else --- 194,200 ---- $db->sql_freeresult($result); ! if ($mx_request_vars->is_request('vote') || !$userdata['session_logged_in']) { ! $view_result = ($mx_request_vars->request('vote') == 'viewresult' || !$userdata['session_logged_in']) ? TRUE : 0; } else Index: mx_last_msg.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_last_msg.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_last_msg.php 4 Feb 2008 16:53:19 -0000 1.6 --- mx_last_msg.php 9 Feb 2008 12:49:53 -0000 1.7 *************** *** 65,69 **** } ! $msg_start = ( isset( $HTTP_GET_VARS['lmsg_start'] ) ) ? intval( $HTTP_GET_VARS['lmsg_start'] ) : 0; $start_prev = ( $msg_start == 0 ) ? 0 : $msg_start - $PostNumber; $start_next = $msg_start + $PostNumber; --- 65,69 ---- } ! $msg_start = $mx_request_vars->get('lmsg_start', MX_TYPE_INT, 0); $start_prev = ( $msg_start == 0 ) ? 0 : $msg_start - $PostNumber; $start_next = $msg_start + $PostNumber; Index: mx_announce.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_announce.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_announce.php 8 Feb 2008 08:29:20 -0000 1.7 --- mx_announce.php 9 Feb 2008 12:49:53 -0000 1.8 *************** *** 43,53 **** // Start initial var setup // ! if ( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]) ) { ! $forum_id = ( isset($HTTP_GET_VARS[POST_FORUM_URL]) ) ? intval($HTTP_GET_VARS[POST_FORUM_URL]) : intval($HTTP_POST_VARS[POST_FORUM_URL]); } ! else if ( isset($HTTP_GET_VARS['forum']) ) { ! $forum_id = intval($HTTP_GET_VARS['forum']); } else --- 43,53 ---- // Start initial var setup // ! if ($mx_request_vars->is_request(POST_FORUM_URL)) { ! $forum_id = $mx_request_vars->request(POST_FORUM_URL, MX_TYPE_INT); } ! else if ($mx_request_vars->is_get('forum') ) { ! $forum_id = $mx_request_vars->get('forum', MX_TYPE_INT); } else *************** *** 59,69 **** // Decide how to order the post display // ! if ( !empty($HTTP_POST_VARS['postorder']) || !empty($HTTP_GET_VARS['postorder']) ) { ! $post_order = ( !empty($HTTP_POST_VARS['postorder']) ) ? $HTTP_POST_VARS['postorder'] : $HTTP_GET_VARS['postorder']; } $post_time_order = ( $post_order == 'asc' ) ? 'ASC' : 'DESC'; ! $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; // --- 59,69 ---- // Decide how to order the post display // ! if ( !$mx_request_vars->is_empty_request('postorder') ) { ! $post_order = $mx_request_vars->request('postorder'); } $post_time_order = ( $post_order == 'asc' ) ? 'ASC' : 'DESC'; ! $start = $mx_request_vars->get('start', MX_TYPE_INT, 0); // Index: mx_forum.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_forum.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_forum.php 4 Feb 2008 16:53:19 -0000 1.6 --- mx_forum.php 9 Feb 2008 12:49:53 -0000 1.7 *************** *** 32,40 **** // ================================================================================ ! $viewcat = ( !empty($HTTP_GET_VARS[POST_CAT_URL]) ) ? $HTTP_GET_VARS[POST_CAT_URL] : -1; ! if( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) ) { ! $mark_read = ( isset($HTTP_POST_VARS['mark']) ) ? $HTTP_POST_VARS['mark'] : $HTTP_GET_VARS['mark']; } else --- 32,40 ---- // ================================================================================ ! $viewcat = $mx_request_vars->get(POST_CAT_URL, MX_TYPE_INT, -1); ! if ($mx_request_vars->is_request('mark')) { ! $mark_read = $mx_request_vars->request('mark', MX_TYPE_NO_TAGS); } else |
|
From: MW <jo...@us...> - 2008-02-09 12:49:26
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28768/modules/mx_navmenu Modified Files: mx_menu_nav.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** mx_menu_nav.php 6 Feb 2008 23:44:03 -0000 1.28 --- mx_menu_nav.php 9 Feb 2008 12:49:19 -0000 1.29 *************** *** 142,146 **** if (!$hasCurrentMenu) { ! if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false ) { $catData[$key]['is_current'] = true; --- 142,146 ---- if (!$hasCurrentMenu) { ! if ($mx_request_vars->is_get('dynamic_block') ? $menuData['block_id'] == $mx_request_vars->get('dynamic_block', MX_TYPE_INT) : false ) { $catData[$key]['is_current'] = true; *************** *** 186,195 **** // For overall_header navigation // - is this current page category? ! $current_cat = ($pageMapping[$mx_page->page_id] == $cat_id || ( isset($HTTP_GET_VARS['cat_link']) ? intval($HTTP_GET_VARS['cat_link']) == $cat_id : false) ) ? true : false; // // Update cookie - if this was a cat link // ! if ( (isset($HTTP_GET_VARS['cat_link']) ? intval($HTTP_GET_VARS['cat_link']) == $cat_id : false) || $current_cat) { setcookie('mxNavCat_' . intval($block_id) . intval($cat_id), true, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); --- 186,195 ---- // For overall_header navigation // - is this current page category? ! $current_cat = ($pageMapping[$mx_page->page_id] == $cat_id || $mx_request_vars->is_get('cat_link') ? $mx_request_vars->get('cat_link', MX_TYPE_INT) == $cat_id : false) ? true : false; // // Update cookie - if this was a cat link // ! if ( $mx_request_vars->is_get('cat_link') ? $mx_request_vars->get('cat_link', MX_TYPE_INT) == $cat_id : false || $current_cat) { setcookie('mxNavCat_' . intval($block_id) . intval($cat_id), true, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); |
|
From: MW <jo...@us...> - 2008-02-09 12:49:22
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28768/modules/mx_navmenu/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_navmenu/admin/mx_module_defs.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** mx_module_defs.php 6 Feb 2008 23:44:02 -0000 1.31 --- mx_module_defs.php 9 Feb 2008 12:49:19 -0000 1.32 *************** *** 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_POST_VARS, $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, $HTTP_COOKIE_VARS, $userdata, $mx_request_vars, $dynamic_block_id, $portalpage, $mx_cache, $phpEx; // *************** *** 128,134 **** // Parameters // ! $submit = ( isset($HTTP_POST_VARS['submit']) ) ? true : false; ! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false; ! $preview = ( isset($HTTP_POST_VARS['preview']) ) ? true : false; $refresh = $preview || $submit_search; --- 128,134 ---- // Parameters // ! $submit = $mx_request_vars->is_post('submit'); ! $cancel = $mx_request_vars->is_post('cancel'); ! $preview = $mx_request_vars->is_post('preview'); $refresh = $preview || $submit_search; *************** *** 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_POST_VARS, $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, $HTTP_COOKIE_VARS, $userdata, $mx_request_vars, $dynamic_block_id, $portalpage, $mx_cache, $phpEx; $mx_page = new mx_page(); *************** *** 744,750 **** // Parameters // ! $submit = ( isset($HTTP_POST_VARS['submit']) ) ? true : false; ! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false; ! $preview = ( isset($HTTP_POST_VARS['preview']) ) ? true : false; $refresh = $preview || $submit_search; --- 744,750 ---- // Parameters // ! $submit = $mx_request_vars->is_post('submit'); ! $cancel = $mx_request_vars->is_post('cancel'); ! $preview = $mx_request_vars->is_post('preview'); $refresh = $preview || $submit_search; *************** *** 1153,1157 **** function _do_insert($type, $id ) { ! global $mx_root_path, $phpbb_root_path, $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $userdata, $mx_request_vars; switch ( $type ) --- 1153,1157 ---- function _do_insert($type, $id ) { ! global $mx_root_path, $phpbb_root_path, $template, $lang, $db, $board_config, $theme, $phpEx, $userdata, $mx_request_vars; switch ( $type ) *************** *** 1161,1165 **** if ( !MX_PANEL_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['cat_title'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 1161,1165 ---- if ( !MX_PANEL_DEBUG ) { ! if ($mx_request_vars->is_empty_post('cat_title')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 1236,1240 **** if ( !MX_PANEL_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['menuname'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 1236,1240 ---- if ( !MX_PANEL_DEBUG ) { ! if ($mx_request_vars->is_empty_post('menuname')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 1301,1306 **** '" . $mx_request_vars->post('menu_alt_icon_hot', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', '" . $mx_request_vars->post('auth_view', MX_TYPE_INT, '') . "', ! '" . $HTTP_POST_VARS['auth_view_group'] . "', ! '" . $HTTP_POST_VARS['link_target'] . "' )"; if( !($result = $db->sql_query($sql)) ) --- 1301,1306 ---- '" . $mx_request_vars->post('menu_alt_icon_hot', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', '" . $mx_request_vars->post('auth_view', MX_TYPE_INT, '') . "', ! '" . $mx_request_vars->post('auth_view_group', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', ! '" . $mx_request_vars->post('link_target', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "' )"; if( !($result = $db->sql_query($sql)) ) *************** *** 1328,1332 **** function _do_update($type, $id ) { ! global $mx_root_path, $phpbb_root_path, $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $userdata, $mx_request_vars, $mx_cache; switch ( $type ) --- 1328,1332 ---- function _do_update($type, $id ) { ! global $mx_root_path, $phpbb_root_path, $template, $lang, $db, $board_config, $theme, $phpEx, $userdata, $mx_request_vars, $mx_cache; switch ( $type ) *************** *** 1336,1340 **** if ( !MX_PANEL_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['cat_title'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 1336,1340 ---- if ( !MX_PANEL_DEBUG ) { ! if ($mx_request_vars->is_empty_post('cat_title')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 1388,1392 **** if ( !MX_PANEL_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['menuname'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 1388,1392 ---- if ( !MX_PANEL_DEBUG ) { ! if ($mx_request_vars->is_empty_post('menuname')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 1442,1446 **** if ( !MX_PANEL_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['menuname'] ) && empty( $HTTP_POST_VARS['cat_title'] )) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 1442,1446 ---- if ( !MX_PANEL_DEBUG ) { ! if ($mx_request_vars->is_empty_post('menuname') && $mx_request_vars->is_empty_post('cat_title')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 1464,1468 **** // Encode for db storage // ! if ( empty( $HTTP_POST_VARS['cat_title'] )) { $menu_title = $mx_text->encode_simple($mx_request_vars->post('menuname', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); --- 1464,1468 ---- // Encode for db storage // ! if ($mx_request_vars->is_empty_post('cat_title')) { $menu_title = $mx_text->encode_simple($mx_request_vars->post('menuname', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); *************** *** 1510,1514 **** function _do_delete($type, $id, $parent, $recache ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $mx_request_vars; switch ( $type ) --- 1510,1514 ---- function _do_delete($type, $id, $parent, $recache ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $mx_request_vars; switch ( $type ) *************** *** 1599,1603 **** function _do_move($type, $id) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $mx_request_vars; switch ( $type ) --- 1599,1603 ---- function _do_move($type, $id) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $mx_request_vars; switch ( $type ) |
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28378/modules/mx_coreblocks Modified Files: mx_site_log.php mx_blockcp.php mx_includex.php mx_search.php mx_theme.php mx_language.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: mx_language.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_language.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mx_language.php 4 Feb 2008 16:04:31 -0000 1.20 --- mx_language.php 9 Feb 2008 12:48:51 -0000 1.21 *************** *** 18,24 **** // Updating language and theme - mx_laguage.php and mx_theme.php coreblocks // ! if ( isset($HTTP_POST_VARS['default_lang']) && preg_match('#^[a-z_]+$#', $HTTP_POST_VARS['default_lang']) && $userdata['user_level'] == ADMIN ) { ! $mx_language = strip_tags($HTTP_POST_VARS['default_lang']); $board_config['default_lang'] = $mx_language; --- 18,24 ---- // Updating language and theme - mx_laguage.php and mx_theme.php coreblocks // ! if ($mx_request_vars->is_post('default_lang') && preg_match('#^[a-z_]+$#', $mx_request_vars->post('default_lang', MX_TYPE_NO_TAGS)) && $userdata['user_level'] == ADMIN ) { ! $mx_language = $mx_request_vars->post('default_lang', MX_TYPE_NO_TAGS); $board_config['default_lang'] = $mx_language; *************** *** 33,39 **** } ! if ( isset($HTTP_POST_VARS['user_lang']) && preg_match('#^[a-z_]+$#', $HTTP_POST_VARS['user_lang']) && $userdata['session_logged_in'] ) { ! $mx_language = strip_tags($HTTP_POST_VARS['user_lang']); $userdata['user_lang'] = $mx_language; --- 33,39 ---- } ! if ($mx_request_vars->is_post('user_lang') && preg_match('#^[a-z_]+$#', $mx_request_vars->post('user_lang', MX_TYPE_NO_TAGS)) && $userdata['session_logged_in'] ) { ! $mx_language = $mx_request_vars->post('user_lang', MX_TYPE_NO_TAGS); $userdata['user_lang'] = $mx_language; Index: mx_site_log.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_site_log.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mx_site_log.php 4 Feb 2008 16:04:30 -0000 1.18 --- mx_site_log.php 9 Feb 2008 12:48:51 -0000 1.19 *************** *** 38,42 **** $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; $start_prev = ( $log_start == 0 ) ? 0 : $log_start - $log_numberOfEvents; --- 38,42 ---- $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 = $mx_request_vars->get('log_start', MX_TYPE_INT, 0); $start_prev = ( $log_start == 0 ) ? 0 : $log_start - $log_numberOfEvents; Index: mx_includex.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_includex.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mx_includex.php 4 Feb 2008 16:04:30 -0000 1.13 --- mx_includex.php 9 Feb 2008 12:48:51 -0000 1.14 *************** *** 22,30 **** $iframe_mode = $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' ) ); // --- 22,30 ---- $iframe_mode = $mx_block->get_parameters( 'x_mode' ); ! $x_mode = ( $iframe_mode == 'x_listen' && $mx_request_vars->get('x_mode', MX_TYPE_NO_TAGS, $iframe_mode) ); ! $x_1 = ( $iframe_mode == 'x_listen' && $mx_request_vars->get('x_1', MX_TYPE_NO_TAGS, $mx_block->get_parameters('x_1'))); ! $x_2 = ( $iframe_mode == 'x_listen' && $mx_request_vars->get('x_2', MX_TYPE_NO_TAGS, $mx_block->get_parameters('x_2'))); ! $x_3 = ( $iframe_mode == 'x_listen' && $mx_request_vars->get('x_3', MX_TYPE_NO_TAGS, $mx_block->get_parameters('x_3'))); // Index: mx_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mx_blockcp.php 4 Feb 2008 16:04:30 -0000 1.20 --- mx_blockcp.php 9 Feb 2008 12:48:51 -0000 1.21 *************** *** 90,97 **** // Parameters // ! $submit = ( isset($HTTP_POST_VARS['submit']) ) ? true : false; ! $submit_pars = ( isset($HTTP_POST_VARS['submit_pars']) ) ? true : false; ! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false; ! $preview = ( isset($HTTP_POST_VARS['preview']) ) ? true : false; $refresh = $preview || $submit_search; --- 90,97 ---- // Parameters // ! $submit = $mx_request_vars->is_post('submit'); ! $submit_pars = $mx_request_vars->is_post('submit_pars'); ! $cancel = $mx_request_vars->is_post('cancel'); ! $preview = $mx_request_vars->is_post('preview'); $refresh = $preview || $submit_search; Index: mx_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_search.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mx_search.php 4 Feb 2008 16:04:30 -0000 1.23 --- mx_search.php 9 Feb 2008 12:48:51 -0000 1.24 *************** *** 29,35 **** $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); ! if ( isset( $HTTP_POST_VARS['search_keywords'] ) || isset( $HTTP_GET_VARS['search_keywords'] ) ) { ! $search_keywords = ( isset( $HTTP_POST_VARS['search_keywords'] ) ) ? $HTTP_POST_VARS['search_keywords'] : $HTTP_GET_VARS['search_keywords']; } else --- 29,35 ---- $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); ! if ($mx_request_vars->is_request('search_keywords')) { ! $search_keywords = $mx_request_vars->request('search_keywords', MX_TYPE_NO_TAGS); } else *************** *** 50,58 **** } ! $show_results = ( isset( $HTTP_POST_VARS['show_results'] ) ) ? $HTTP_POST_VARS['show_results'] : 'posts'; ! if ( isset( $HTTP_POST_VARS['search_terms'] ) ) { ! $search_terms = ( $HTTP_POST_VARS['search_terms'] == 'all' ) ? 1 : 0; } else --- 50,58 ---- } ! $show_results = $mx_request_vars->post('show_results', MX_TYPE_NO_TAGS, 'posts'); ! if ($mx_request_vars->is_post('search_terms')) { ! $search_terms = ( $mx_request_vars->post('search_terms',MX_TYPE_NO_TAGS) == 'all' ) ? 1 : 0; } else *************** *** 61,67 **** } ! if ( isset( $HTTP_POST_VARS['search_fields'] ) ) { ! $search_fields = ( $HTTP_POST_VARS['search_fields'] == 'all' ) ? 1 : 0; } else --- 61,67 ---- } ! if ( $mx_request_vars->is_post('search_fields')) { ! $search_fields = ($mx_request_vars->post('search_fields', MX_TYPE_NO_TAGS) == 'all' ) ? 1 : 0; } else *************** *** 70,78 **** } ! $sort_by = ( isset( $HTTP_POST_VARS['sort_by'] ) ) ? intval( $HTTP_POST_VARS['sort_by'] ) : 0; ! if ( isset( $HTTP_POST_VARS['sort_dir'] ) ) { ! $sort_dir = ( $HTTP_POST_VARS['sort_dir'] == 'DESC' ) ? 'DESC' : 'ASC'; } else --- 70,78 ---- } ! $sort_by = $mx_request_vars->post('sort_by', MX_TYPE_INT, 0); ! if ($mx_request_vars->is_post('sort_dir')) { ! $sort_dir = ($mx_request_vars->post('sort_dir', MX_TYPE_NO_TAGS) == 'DESC' ) ? 'DESC' : 'ASC'; } else *************** *** 81,85 **** } ! $start = ( isset( $HTTP_GET_VARS['start'] ) ) ? intval( $HTTP_GET_VARS['start'] ) : 0; $per_page = $board_config['topics_per_page']; --- 81,85 ---- } ! $start = $mx_request_vars->get('start', MX_TYPE_INT, 0); $per_page = $board_config['topics_per_page']; Index: mx_theme.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_theme.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mx_theme.php 4 Feb 2008 16:04:30 -0000 1.20 --- mx_theme.php 9 Feb 2008 12:48:51 -0000 1.21 *************** *** 15,21 **** } ! if ( isset($HTTP_POST_VARS['default_style']) && $userdata['user_level'] == ADMIN ) { ! $mx_default_style = intval($HTTP_POST_VARS['default_style']); $board_config['default_style'] = $mx_default_style; --- 15,21 ---- } ! if ($mx_request_vars->is_post('default_style') && $userdata['user_level'] == ADMIN ) { ! $mx_default_style = $mx_request_vars->post('default_style', MX_TYPE_INT); $board_config['default_style'] = $mx_default_style; *************** *** 31,37 **** } ! if ( isset($HTTP_POST_VARS['user_style']) && $userdata['session_logged_in'] ) { ! $mx_user_style = intval($HTTP_POST_VARS['user_style']); $userdata['user_style'] = $mx_user_style; --- 31,37 ---- } ! if ($mx_request_vars->is_post('user_style') && $userdata['session_logged_in'] ) { ! $mx_user_style = $mx_request_vars->post('user_style', MX_TYPE_INT); $userdata['user_style'] = $mx_user_style; |
|
From: MW <jo...@us...> - 2008-02-09 12:48:20
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28355/install Modified Files: mx_install.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** mx_install.php 9 Feb 2008 00:35:52 -0000 1.87 --- mx_install.php 9 Feb 2008 12:48:16 -0000 1.88 *************** *** 398,402 **** // Send file -------------------------------------------------- // ! if ( isset($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 1 ) { header( "Content-Type: text/x-delimtext; name=\"config.$phpEx\"" ); --- 398,402 ---- // Send file -------------------------------------------------- // ! if ($mx_request_vars->post('send_file', MX_TYPE_INT) == 1 ) { header( "Content-Type: text/x-delimtext; name=\"config.$phpEx\"" ); *************** *** 405,412 **** // We need to stripslashes no matter what the setting of magic_quotes_gpc is // because we add slahes at the top if its off, and they are added automaticlly ! // if it is on. ! $HTTP_POST_VARS['config_data'] = stripslashes( $HTTP_POST_VARS['config_data'] ); ! echo $HTTP_POST_VARS['config_data']; exit; } --- 405,411 ---- // We need to stripslashes no matter what the setting of magic_quotes_gpc is // because we add slahes at the top if its off, and they are added automaticlly ! // if it is on. $mx_request_vars->post strips slashes ! echo $mx_request_vars->post('config_data', MX_TYPE_NO_TAGS); exit; } *************** *** 415,419 **** // phpInfo -------------------------------------------------- // ! if ( isset($HTTP_GET_VARS['phpinfo']) ) { show_phpinfo(); --- 414,418 ---- // phpInfo -------------------------------------------------- // ! if ($mx_request_vars->is_get('phpinfo') ) { show_phpinfo(); *************** *** 424,428 **** // Load the installation language // ! $language = ( isset($HTTP_POST_VARS['language']) ? $HTTP_POST_VARS['language'] : ( isset($HTTP_GET_VARS['language']) ? $HTTP_GET_VARS['language'] : '' ) ); $language = ( preg_match('#^[a-z_]+$#', $language) ? strip_tags($language) : '' ); --- 423,427 ---- // Load the installation language // ! $language = $mx_request_vars->request('language', MX_TYPE_NO_TAGS); $language = ( preg_match('#^[a-z_]+$#', $language) ? strip_tags($language) : '' ); *************** *** 480,489 **** } ! $board_email = (!empty($HTTP_POST_VARS['board_email'])) ? $HTTP_POST_VARS['board_email'] : ''; ! $script_path = (!empty($HTTP_POST_VARS['script_path'])) ? $HTTP_POST_VARS['script_path'] : str_replace('install', '', dirname($HTTP_SERVER_VARS['PHP_SELF'])); ! if (!empty($HTTP_POST_VARS['server_name'])) { ! $server_name = $HTTP_POST_VARS['server_name']; } else --- 479,488 ---- } ! $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')) { ! $server_name = $mx_request_vars->post('server_name', MX_TYPE_NO_TAGS); } else *************** *** 504,510 **** } ! if (!empty($HTTP_POST_VARS['server_port'])) { ! $server_port = $HTTP_POST_VARS['server_port']; } else --- 503,509 ---- } ! if (!$mx_request_vars->is_empty_post('server_port')) { ! $server_port = $mx_request_vars->post('server_port', MX_TYPE_NO_TAGS); } else *************** *** 523,531 **** // Do install -------------------------------------------------- // ! $confirm = ( isset($HTTP_POST_VARS['confirm']) || isset($HTTP_GET_VARS['confirm']) ) && !isset($HTTP_POST_VARS['debug']); if( $confirm ) { ! $install_mode = ( isset($HTTP_POST_VARS['install_mode']) ? $HTTP_POST_VARS['install_mode'] : ( isset($HTTP_GET_VARS['install_mode']) ? $HTTP_GET_VARS['install_mode'] : '' ) ); $install_mode = ( preg_match('#^[a-z_]+$#', $install_mode) ? strip_tags($install_mode) : '' ); --- 522,530 ---- // Do install -------------------------------------------------- // ! $confirm = $mx_request_vars->is_request('confirm') && !$mx_request_vars->is_post('debug'); if( $confirm ) { ! $install_mode = $mx_request_vars->request('install_mode', MX_TYPE_NO_TAGS); $install_mode = ( preg_match('#^[a-z_]+$#', $install_mode) ? strip_tags($install_mode) : '' ); *************** *** 536,552 **** case 'install': ! if ($HTTP_POST_VARS['mxbb']) { ! $portal_url = ( !empty($HTTP_POST_VARS['portal_url']) ? $HTTP_POST_VARS['portal_url'] : '' ); ! $phpbb_path = ( !empty($HTTP_POST_VARS['phpbb_path']) ? $HTTP_POST_VARS['phpbb_path'] : '' ); ! //$phpbb_url = ( !empty($HTTP_POST_VARS['phpbb_url']) ? $HTTP_POST_VARS['phpbb_url'] : '' ); ! $dbms = ( isset($HTTP_POST_VARS['dbms_mxbb']) ? $HTTP_POST_VARS['dbms_mxbb'] : '' ); ! $dbhost = ( !empty($HTTP_POST_VARS['dbhost_mxbb']) ? $HTTP_POST_VARS['dbhost_mxbb'] : '' ); ! $dbname = ( !empty($HTTP_POST_VARS['dbname_mxbb']) ? $HTTP_POST_VARS['dbname_mxbb'] : '' ); ! $dbuser = ( !empty($HTTP_POST_VARS['dbuser_mxbb']) ? $HTTP_POST_VARS['dbuser_mxbb'] : '' ); ! $dbpasswd = ( !empty($HTTP_POST_VARS['dbpasswd_mxbb']) ? $HTTP_POST_VARS['dbpasswd_mxbb'] : '' ); ! //$table_prefix = ( !empty($HTTP_POST_VARS['prefix']) ? $HTTP_POST_VARS['prefix'] : '' ); ! $mx_table_prefix = ( !empty($HTTP_POST_VARS['mx_prefix']) ? $HTTP_POST_VARS['mx_prefix'] : '' ); ! //$acm_type = ( isset($HTTP_POST_VARS['acm_type']) ? $HTTP_POST_VARS['acm_type'] : '' ); $portal_backend = 'internal'; --- 535,551 ---- case 'install': ! if ($mx_request_vars->is_post('mxbb')) { ! $portal_url = $mx_request_vars->post('portal_url', MX_TYPE_NO_TAGS); ! $phpbb_path = $mx_request_vars->post('phpbb_path', MX_TYPE_NO_TAGS); ! //$phpbb_url = $mx_request_vars->post('phpbb_url', MX_TYPE_NO_TAGS); ! $dbms = $mx_request_vars->post('dbms_mxbb', MX_TYPE_NO_TAGS); ! $dbhost = $mx_request_vars->post('dbhost_mxbb', MX_TYPE_NO_TAGS); ! $dbname = $mx_request_vars->post('dbname_mxbb',MX_TYPE_NO_TAGS); ! $dbuser = $mx_request_vars->post('dbuser_mxbb', MX_TYPE_NO_TAGS); ! $dbpasswd = $mx_request_vars->post('dbpasswd_mxbb', MX_TYPE_NO_TAGS); ! //$table_prefix = $mx_request_vars->post('prefix', MX_TYPE_NO_TAGS); ! $mx_table_prefix = $mx_request_vars->post('mx_prefix', MX_TYPE_NO_TAGS); ! //$acm_type = $mx_request_vars->post('acm_type', MX_TYPE_NO_TAGS); $portal_backend = 'internal'; *************** *** 554,568 **** else { ! $portal_url = ( !empty($HTTP_POST_VARS['portal_url']) ? $HTTP_POST_VARS['portal_url'] : '' ); ! $phpbb_path = ( !empty($HTTP_POST_VARS['phpbb_path']) ? $HTTP_POST_VARS['phpbb_path'] : '' ); ! //$phpbb_url = ( !empty($HTTP_POST_VARS['phpbb_url']) ? $HTTP_POST_VARS['phpbb_url'] : '' ); ! $dbms = ( isset($HTTP_POST_VARS['dbms']) ? $HTTP_POST_VARS['dbms'] : '' ); ! $dbhost = ( !empty($HTTP_POST_VARS['dbhost']) ? $HTTP_POST_VARS['dbhost'] : '' ); ! $dbname = ( !empty($HTTP_POST_VARS['dbname']) ? $HTTP_POST_VARS['dbname'] : '' ); ! $dbuser = ( !empty($HTTP_POST_VARS['dbuser']) ? $HTTP_POST_VARS['dbuser'] : '' ); ! $dbpasswd = ( !empty($HTTP_POST_VARS['dbpasswd']) ? $HTTP_POST_VARS['dbpasswd'] : '' ); ! $table_prefix = ( !empty($HTTP_POST_VARS['prefix']) ? $HTTP_POST_VARS['prefix'] : '' ); ! $mx_table_prefix = ( !empty($HTTP_POST_VARS['mx_prefix']) ? $HTTP_POST_VARS['mx_prefix'] : '' ); ! //$acm_type = ( isset($HTTP_POST_VARS['acm_type']) ? $HTTP_POST_VARS['acm_type'] : '' ); $portal_backend = file_exists($mx_root_path . $phpbb_path . "modcp.$phpEx") ? 'phpbb2' : 'phpbb3'; --- 553,567 ---- else { ! $portal_url = $mx_request_vars->post('portal_url', MX_TYPE_NO_TAGS); ! $phpbb_path = $mx_request_vars->post('phpbb_path', MX_TYPE_NO_TAGS); ! //$phpbb_url = $mx_request_vars->post('phpbb_url', MX_TYPE_NO_TAGS); ! $dbms = $mx_request_vars->post('dbms', MX_TYPE_NO_TAGS); ! $dbhost = $mx_request_vars->post('dbhost', MX_TYPE_NO_TAGS); ! $dbname = $mx_request_vars->post('dbname', MX_TYPE_NO_TAGS); ! $dbuser = $mx_request_vars->post('dbuser', MX_TYPE_NO_TAGS); ! $dbpasswd = $mx_request_vars->post('dbpasswd', MX_TYPE_NO_TAGS); ! $table_prefix = $mx_request_vars->post('prefix', MX_TYPE_NO_TAGS); ! $mx_table_prefix = $mx_request_vars->post('mx_prefix', MX_TYPE_NO_TAGS); ! //$acm_type = $mx_request_vars->post('acm_type', MX_TYPE_NO_TAGS); $portal_backend = file_exists($mx_root_path . $phpbb_path . "modcp.$phpEx") ? 'phpbb2' : 'phpbb3'; *************** *** 579,583 **** // If they entered the information manually, we need to verify they did it correctly ;-) // ! if ($HTTP_POST_VARS['phpbb']) { $phpbb_info = get_phpbb_info($mx_root_path . $phpbb_path . "config.$phpEx"); --- 578,582 ---- // If they entered the information manually, we need to verify they did it correctly ;-) // ! if ($mx_request_vars->is_post('phpbb')) { $phpbb_info = get_phpbb_info($mx_root_path . $phpbb_path . "config.$phpEx"); *************** *** 789,793 **** ); ! if ($HTTP_POST_VARS['mxbb']) // Internal install { $portal_table['default_style'] = "'1'"; --- 788,792 ---- ); ! if ($mx_request_vars->is_post('mxbb')) // Internal install { $portal_table['default_style'] = "'1'"; *************** *** 1187,1191 **** // DEBUG ONLY ;-) // ! if (isset($HTTP_POST_VARS['debug'])) { $phpbb_found = false; --- 1186,1190 ---- // DEBUG ONLY ;-) // ! if ($mx_request_vars->is_post('debug')) { $phpbb_found = false; |
|
From: MW <jo...@us...> - 2008-02-09 12:47:18
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27949/install/schemas Modified Files: mysql_41_schema_install.sql Log Message: semantic adjustments Index: mysql_41_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_41_schema_install.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mysql_41_schema_install.sql 5 Feb 2008 18:37:20 -0000 1.2 --- mysql_41_schema_install.sql 9 Feb 2008 12:47:15 -0000 1.3 *************** *** 36,63 **** # Dumping data for table 'mx_table_block' # ! INSERT INTO mx_table_block VALUES("1", "phpBB TextBlock", "This is a Demo Block", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1125865999", "2"); ! INSERT INTO mx_table_block VALUES("2", "Split Block", "This is a Demo Block", "11", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1144407740", "2"); ! INSERT INTO mx_table_block VALUES("3", "Site Log", "This is a Demo Block", "10", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841954", "2"); ! INSERT INTO mx_table_block VALUES("4", "Dynamic Block", "This is a Demo Block", "3", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841802", "2"); ! INSERT INTO mx_table_block VALUES("6", "Poll", "This is a Demo Block", "14", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841942", "2"); ! INSERT INTO mx_table_block VALUES("7", "Language Select", "This is a Demo Block", "6", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841887", "2"); ! INSERT INTO mx_table_block VALUES("8", "Navigation Menu", "This is a vertical Navigation Menu Demo Block", "51", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1126034018", "2"); ! INSERT INTO mx_table_block VALUES("9", "mxBB TextBlock", "This is a Demo Block", "22", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1144408393", "2"); ! INSERT INTO mx_table_block VALUES("10", "WYSIWYG TextBlock", "This is a Demo Block", "23", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1144408349", "2"); ! INSERT INTO mx_table_block VALUES("13", "Login", "This is a Demo Block", "7", "9", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125867452", "2"); ! INSERT INTO mx_table_block VALUES("14", "Theme Select", "This is a Demo Block", "12", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841964", "2"); ! INSERT INTO mx_table_block VALUES("15", "Site Search", "Site Search", "15", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841954", "2"); ! INSERT INTO mx_table_block VALUES("16", "Last Message Post", "This is a Demo Block", "31", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125842159", "2"); ! INSERT INTO mx_table_block VALUES("18", "Announcements", "This is a Demo Block", "2", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125868467", "2"); ! INSERT INTO mx_table_block VALUES("19", "Who is Online?", "This is a Demo Block", "13", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841983", "2"); ! INSERT INTO mx_table_block VALUES("21", "Google", "This is a Demo Block", "4", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1126033253", "2"); ! INSERT INTO mx_table_block VALUES("24", "Forum", "This is a Demo Block", "8", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841817", "2"); ! INSERT INTO mx_table_block VALUES("25", "Navigation Menu", "This is a horizontal Navigation Menu Demo Block", "51", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1144406422", "2"); ! INSERT INTO mx_table_block VALUES("26", "Statistics", "This is a Demo Block", "41", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125842177", "2"); ! INSERT INTO mx_table_block VALUES("27", "IncludeX", "This is a Demo Block", "5", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841878", "2"); ! INSERT INTO mx_table_block VALUES("28", "Welcome", "This is the firstpage welcome block", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1144408417", "2"); ! INSERT INTO mx_table_block VALUES("29", "Demo Pages", "Introduction", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1144407996", "2"); ! INSERT INTO mx_table_block VALUES("30", "Modules Info", "Introduction", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1144407795", "2"); ! INSERT INTO mx_table_block VALUES("31", "Page Navigation", "This is a page navigation menu", "52", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1144406422", "2"); --- 36,63 ---- # Dumping data for table 'mx_table_block' # ! INSERT INTO mx_table_block VALUES('1', 'phpBB TextBlock', 'This is a Demo Block', '24', '0', '5', '0', '0', '0', '0', '0', '1', '1', '1', '1125865999', '2'); ! INSERT INTO mx_table_block VALUES('2', 'Split Block', 'This is a Demo Block', '11', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1144407740', '2'); ! INSERT INTO mx_table_block VALUES('3', 'Site Log', 'This is a Demo Block', '10', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125841954', '2'); ! INSERT INTO mx_table_block VALUES('4', 'Dynamic Block', 'This is a Demo Block', '3', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125841802', '2'); ! INSERT INTO mx_table_block VALUES('6', 'Poll', 'This is a Demo Block', '14', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125841942', '2'); ! INSERT INTO mx_table_block VALUES('7', 'Language Select', 'This is a Demo Block', '6', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125841887', '2'); ! INSERT INTO mx_table_block VALUES('8', 'Navigation Menu', 'This is a vertical Navigation Menu Demo Block', '51', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1126034018', '2'); ! INSERT INTO mx_table_block VALUES('9', 'mxBB TextBlock', 'This is a Demo Block', '22', '0', '5', '0', '0', '0', '0', '0', '1', '1', '1', '1144408393', '2'); ! INSERT INTO mx_table_block VALUES('10', 'WYSIWYG TextBlock', 'This is a Demo Block', '23', '0', '5', '0', '0', '0', '0', '0', '1', '1', '1', '1144408349', '2'); ! INSERT INTO mx_table_block VALUES('13', 'Login', 'This is a Demo Block', '7', '9', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125867452', '2'); ! INSERT INTO mx_table_block VALUES('14', 'Theme Select', 'This is a Demo Block', '12', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125841964', '2'); ! INSERT INTO mx_table_block VALUES('15', 'Site Search', 'Site Search', '15', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125841954', '2'); ! INSERT INTO mx_table_block VALUES('16', 'Last Message Post', 'This is a Demo Block', '31', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125842159', '2'); ! INSERT INTO mx_table_block VALUES('18', 'Announcements', 'This is a Demo Block', '2', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125868467', '2'); ! INSERT INTO mx_table_block VALUES('19', 'Who is Online?', 'This is a Demo Block', '13', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125841983', '2'); ! INSERT INTO mx_table_block VALUES('21', 'Google', 'This is a Demo Block', '4', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1126033253', '2'); ! INSERT INTO mx_table_block VALUES('24', 'Forum', 'This is a Demo Block', '8', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125841817', '2'); ! INSERT INTO mx_table_block VALUES('25', 'Navigation Menu', 'This is a horizontal Navigation Menu Demo Block', '51', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1144406422', '2'); ! INSERT INTO mx_table_block VALUES('26', 'Statistics', 'This is a Demo Block', '41', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125842177', '2'); ! INSERT INTO mx_table_block VALUES('27', 'IncludeX', 'This is a Demo Block', '5', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1125841878', '2'); ! INSERT INTO mx_table_block VALUES('28', 'Welcome', 'This is the firstpage welcome block', '24', '0', '5', '0', '0', '0', '0', '0', '1', '1', '1', '1144408417', '2'); ! INSERT INTO mx_table_block VALUES('29', 'Demo Pages', 'Introduction', '24', '0', '5', '0', '0', '0', '0', '0', '1', '1', '1', '1144407996', '2'); ! INSERT INTO mx_table_block VALUES('30', 'Modules Info', 'Introduction', '24', '0', '5', '0', '0', '0', '0', '0', '1', '1', '1', '1144407795', '2'); ! INSERT INTO mx_table_block VALUES('31', 'Page Navigation', 'This is a page navigation menu', '52', '0', '5', '0', '0', '0', '0', '0', '1', '1', '0', '1144406422', '2'); *************** *** 81,155 **** # Dumping data for table 'mx_table_block_system_parameter' # ! INSERT INTO mx_table_block_system_parameter VALUES("1", "15", "This is a [i:d4ee1ca70a]standard [/i:d4ee1ca70a]TextBlock, featuring BBCode, HTML, and smilies, as defined by the phpBB config settings.\r\n\r\nTry it out! \r\n(to edit use the top right edit button)", "d4ee1ca70a", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("2", "60", "16,13,9", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("2", "61", "33%, 33%,*", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("2", "62", "4", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("3", "91", "3 months", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("3", "92", "5", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("4", "80", "29", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("6", "36", "", NULL, "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("6", "13", "0", NULL, "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("8", "66", "", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("8", "93", "", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("8", "63", "Vertical", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("25", "66", "", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("25", "93", "", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("25", "63", "Horizontal", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("31", "100", "", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("31", "101", "", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("31", "102", "Overall_navigation", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("9", "50", "This is basically a [i:021a122fa6]standard[/i:021a122fa6] TextBlock, but you may configure settings for bbcodes, html and smilies for [i:021a122fa6]this[/i:021a122fa6] block.\r\n\r\nTry it out! \r\n(to edit use the top right edit button)", "021a122fa6", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("9", "51", "none", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("9", "52", "TRUE", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("9", "53", "TRUE", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("9", "56", "TRUE", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("9", "54", "TRUE", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("9", "57", "TRUE", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("9", "55", "b,i,u,img", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("10", "16", "<table width=\"100%\" cellpadding=\"2\" border=\"0\"><tbody><tr><td valign=\"top\" align=\"left\" class=\"row2\"><span class=\"genmed\"><strong>Mon</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- MÅNDAG -->Busy with <em>this and that</em></span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row1\"><span class=\"genmed\"><strong>Tue</strong></span></td><td class=\"row1\"><span class=\"gensmall\"><!-- TISDAG-->Not so busy</span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row2\"><span class=\"genmed\"><strong>Wen</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- ONSDAG-->Very busy</span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row1\"><span class=\"genmed\"><strong>Thu</strong></span></td><td class=\"row1\"><span class=\"gensmall\"><!-- TORSDAG-->Lazy</span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row2\"><span class=\"genmed\"><strong>Fri</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- FREDAG-->Resting...</span></td></tr></tbody></table><p>This basic table structure is a nice demonstration in which the wysiwyg editor comes in handy!</p><p>Try it out! <br />(to edit use the top right edit button)</p><p>Note: The wysiwyg editor is a 3rd party product (tinyMCE), and must be installed separately. Visit <a target=\"_blank\" href=\"http://www.moxiecode.com\">Moxiecode Systems AB</a> to get the software and place the \'tinymce\' folder in the root/modules/mx_shared directory. </p>", "0", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("16", "17", "5", NULL, "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("16", "18", "TRUE", NULL, "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("16", "19", "30", NULL, "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("16", "20", "_self", NULL, "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("16", "21", "left", NULL, "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("16", "22", "TRUE", NULL, "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("16", "37", "", NULL, "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("16", "38", "FALSE", NULL, "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("16", "39", "FALSE", NULL, "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("16", "40", "TRUE", NULL, "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("16", "95", "5", NULL, "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("18", "1", "3", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("18", "2", "10", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("18", "3", "TRUE", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("18", "4", "TRUE", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("18", "5", "FALSE", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("18", "7", "thumb_news.gif", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("18", "8", "thumb_globe.gif", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("18", "9", "thumb_globe.gif", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("18", "6", "TRUE", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("18", "10", "thumb_globe.gif", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("18", "11", "", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("27", "70", "x_iframe", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("27", "71", "/docs", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("27", "72", "325", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("27", "73", "", "", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("28", "15", "[b:31f05e4fa3]MX-Publisher[/b:31f05e4fa3] is a fully modular portal and CMS for phpBB, featuring dynamic pages, blocks, themes, and more by means of a powerful yet flexible AdminCP. It works without touching phpBB by using integrated features and functions. MX-Publisher requires phpBB to run, and currently supports the mySQL and postgreSQL databases, with planned support for MS-SQL and other DBMSs. MX-Publisher is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001.\r\n\r\n[i:31f05e4fa3]Welcome, and thanks for using the mxBB-Portal![/i:31f05e4fa3] \r\n\r\n :lol:", "31f05e4fa3", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("29", "15", "On this page we [i:621ded23c6]demonstrate [/i:621ded23c6]a few basic portal blocks (not already present on this or other pages) - to get you started. Please, try out the top links.", "621ded23c6", "0"); ! INSERT INTO mx_table_block_system_parameter VALUES("30", "15", "You may enrich your portal with addon modules - for specific functionality:\r\n\r\n- Download manager\r\n- Picture Album\r\n- Calendar Tools\r\n- Knowledge Base\r\n- Links Gallery\r\n- Games\r\n\r\nand many more. Be sure to visit www.mx-publisher.com for latest available modules!", "eacbc1f61a", "0"); # --- 81,155 ---- # Dumping data for table 'mx_table_block_system_parameter' # ! INSERT INTO mx_table_block_system_parameter VALUES('1', '15', 'This is a [i:d4ee1ca70a]standard [/i:d4ee1ca70a]TextBlock, featuring BBCode, HTML, and smilies, as defined by the phpBB config settings.\r\n\r\nTry it out! \r\n(to edit use the top right edit button)', 'd4ee1ca70a', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('2', '60', '16,13,9', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('2', '61', '33%, 33%,*', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('2', '62', '4', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('3', '91', '3 months', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('3', '92', '5', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('4', '80', '29', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('6', '36', '', NULL, '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('6', '13', '0', NULL, '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('8', '66', '', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('8', '93', '', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('8', '63', 'Vertical', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('25', '66', '', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('25', '93', '', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('25', '63', 'Horizontal', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('31', '100', '', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('31', '101', '', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('31', '102', 'Overall_navigation', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('9', '50', 'This is basically a [i:021a122fa6]standard[/i:021a122fa6] TextBlock, but you may configure settings for bbcodes, html and smilies for [i:021a122fa6]this[/i:021a122fa6] block.\r\n\r\nTry it out! \r\n(to edit use the top right edit button)', '021a122fa6', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('9', '51', 'none', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('9', '52', 'TRUE', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('9', '53', 'TRUE', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('9', '56', 'TRUE', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('9', '54', 'TRUE', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('9', '57', 'TRUE', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('9', '55', 'b,i,u,img', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('10', '16', '<table width=\'100%\' cellpadding=\'2\' border=\'0\'><tbody><tr><td valign=\'top\' align=\'left\' class=\'row2\'><span class=\'genmed\'><strong>Mon</strong></span></td><td class=\'row2\'><span class=\'gensmall\'><!-- MÅNDAG -->Busy with <em>this and that</em></span></td></tr><tr><td valign=\'top\' align=\'left\' class=\'row1\'><span class=\'genmed\'><strong>Tue</strong></span></td><td class=\'row1\'><span class=\'gensmall\'><!-- TISDAG-->Not so busy</span></td></tr><tr><td valign=\'top\' align=\'left\' class=\'row2\'><span class=\'genmed\'><strong>Wen</strong></span></td><td class=\'row2\'><span class=\'gensmall\'><!-- ONSDAG-->Very busy</span></td></tr><tr><td valign=\'top\' align=\'left\' class=\'row1\'><span class=\'genmed\'><strong>Thu</strong></span></td><td class=\'row1\'><span class=\'gensmall\'><!-- TORSDAG-->Lazy</span></td></tr><tr><td valign=\'top\' align=\'left\' class=\'row2\'><span class=\'genmed\'><strong>Fri</strong></span></td><td class=\'row2\'><span class=\'gensmall\'><!-- FREDAG-->Resting...</span></td></tr></tbody></table><p>This basic table structure is a nice demonstration in which the wysiwyg editor comes in handy!</p><p>Try it out! <br />(to edit use the top right edit button)</p><p>Note: The wysiwyg editor is a 3rd party product (tinyMCE), and must be installed separately. Visit <a target=\'_blank\' href=\'http://www.moxiecode.com\'>Moxiecode Systems AB</a> to get the software and place the \'tinymce\' folder in the root/modules/mx_shared directory. </p>', '0', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('16', '17', '5', NULL, '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('16', '18', 'TRUE', NULL, '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('16', '19', '30', NULL, '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('16', '20', '_self', NULL, '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('16', '21', 'left', NULL, '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('16', '22', 'TRUE', NULL, '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('16', '37', '', NULL, '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('16', '38', 'FALSE', NULL, '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('16', '39', 'FALSE', NULL, '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('16', '40', 'TRUE', NULL, '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('16', '95', '5', NULL, '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('18', '1', '3', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('18', '2', '10', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('18', '3', 'TRUE', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('18', '4', 'TRUE', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('18', '5', 'FALSE', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('18', '7', 'thumb_news.gif', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('18', '8', 'thumb_globe.gif', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('18', '9', 'thumb_globe.gif', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('18', '6', 'TRUE', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('18', '10', 'thumb_globe.gif', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('18', '11', '', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('27', '70', 'x_iframe', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('27', '71', '/docs', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('27', '72', '325', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('27', '73', '', '', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('28', '15', '[b:31f05e4fa3]MX-Publisher[/b:31f05e4fa3] is a fully modular portal and CMS for phpBB, featuring dynamic pages, blocks, themes, and more by means of a powerful yet flexible AdminCP. It works without touching phpBB by using integrated features and functions. MX-Publisher requires phpBB to run, and currently supports the mySQL and postgreSQL databases, with planned support for MS-SQL and other DBMSs. MX-Publisher is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001.\r\n\r\n[i:31f05e4fa3]Welcome, and thanks for using the mxBB-Portal![/i:31f05e4fa3] \r\n\r\n :lol:', '31f05e4fa3', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('29', '15', 'On this page we [i:621ded23c6]demonstrate [/i:621ded23c6]a few basic portal blocks (not already present on this or other pages) - to get you started. Please, try out the top links.', '621ded23c6', '0'); ! INSERT INTO mx_table_block_system_parameter VALUES('30', '15', 'You may enrich your portal with addon modules - for specific functionality:\r\n\r\n- Download manager\r\n- Picture Album\r\n- Calendar Tools\r\n- Knowledge Base\r\n- Links Gallery\r\n- Games\r\n\r\nand many more. Be sure to visit www.mx-publisher.com for latest available modules!', 'eacbc1f61a', '0'); # *************** *** 174,188 **** # Dumping data for table 'mx_table_column' # ! INSERT INTO mx_table_column VALUES("8", "Main", "50", NULL, "100%", "4"); ! INSERT INTO mx_table_column VALUES("2", "Main", "35", NULL, "100%", "1"); ! INSERT INTO mx_table_column VALUES("7", "Left", "40", NULL, "200", "4"); ! INSERT INTO mx_table_column VALUES("6", "Main", "50", NULL, "100%", "3"); ! INSERT INTO mx_table_column VALUES("5", "Left", "40", NULL, "200", "3"); ! INSERT INTO mx_table_column VALUES("4", "Main", "50", NULL, "100%", "2"); ! INSERT INTO mx_table_column VALUES("1", "Left", "25", NULL, "200", "1"); ! INSERT INTO mx_table_column VALUES("3", "Left", "40", NULL, "200", "2"); ! INSERT INTO mx_table_column VALUES("10", "Main", "50", NULL, "100%", "5"); ! INSERT INTO mx_table_column VALUES("9", "Left", "40", NULL, "200", "5"); ! # --- 174,187 ---- # Dumping data for table 'mx_table_column' # ! INSERT INTO mx_table_column VALUES('8', 'Main', '50', NULL, '100%', '4'); ! INSERT INTO mx_table_column VALUES('2', 'Main', '35', NULL, '100%', '1'); ! INSERT INTO mx_table_column VALUES('7', 'Left', '40', NULL, '200', '4'); ! INSERT INTO mx_table_column VALUES('6', 'Main', '50', NULL, '100%', '3'); ! INSERT INTO mx_table_column VALUES('5', 'Left', '40', NULL, '200', '3'); ! INSERT INTO mx_table_column VALUES('4', 'Main', '50', NULL, '100%', '2'); ! INSERT INTO mx_table_column VALUES('1', 'Left', '25', NULL, '200', '1'); ! INSERT INTO mx_table_column VALUES('3', 'Left', '40', NULL, '200', '2'); ! INSERT INTO mx_table_column VALUES('10', 'Main', '50', NULL, '100%', '5'); ! INSERT INTO mx_table_column VALUES('9', 'Left', '40', NULL, '200', '5'); # *************** *** 203,227 **** # Dumping data for table 'mx_table_column_block' # ! INSERT INTO mx_table_column_block VALUES("5", "14", "40"); ! INSERT INTO mx_table_column_block VALUES("4", "19", "20"); ! INSERT INTO mx_table_column_block VALUES("8", "19", "20"); ! INSERT INTO mx_table_column_block VALUES("4", "24", "10"); ! INSERT INTO mx_table_column_block VALUES("1", "13", "20"); ! INSERT INTO mx_table_column_block VALUES("3", "16", "20"); ! INSERT INTO mx_table_column_block VALUES("5", "3", "30"); ! INSERT INTO mx_table_column_block VALUES("2", "19", "20"); ! INSERT INTO mx_table_column_block VALUES("2", "28", "10"); ! INSERT INTO mx_table_column_block VALUES("1", "8", "10"); ! INSERT INTO mx_table_column_block VALUES("6", "25", "10"); ! INSERT INTO mx_table_column_block VALUES("8", "26", "10"); ! INSERT INTO mx_table_column_block VALUES("7", "8", "10"); ! INSERT INTO mx_table_column_block VALUES("6", "4", "20"); ! INSERT INTO mx_table_column_block VALUES("5", "8", "10"); ! INSERT INTO mx_table_column_block VALUES("6", "19", "30"); ! INSERT INTO mx_table_column_block VALUES("5", "7", "20"); ! INSERT INTO mx_table_column_block VALUES("3", "13", "30"); ! INSERT INTO mx_table_column_block VALUES("3", "8", "10"); ! INSERT INTO mx_table_column_block VALUES("10", "15", "10"); ! INSERT INTO mx_table_column_block VALUES("9", "8", "10"); --- 202,226 ---- # Dumping data for table 'mx_table_column_block' # ! INSERT INTO mx_table_column_block VALUES('5', '14', '40'); ! INSERT INTO mx_table_column_block VALUES('4', '19', '20'); ! INSERT INTO mx_table_column_block VALUES('8', '19', '20'); ! INSERT INTO mx_table_column_block VALUES('4', '24', '10'); ! INSERT INTO mx_table_column_block VALUES('1', '13', '20'); ! INSERT INTO mx_table_column_block VALUES('3', '16', '20'); ! INSERT INTO mx_table_column_block VALUES('5', '3', '30'); ! INSERT INTO mx_table_column_block VALUES('2', '19', '20'); ! INSERT INTO mx_table_column_block VALUES('2', '28', '10'); ! INSERT INTO mx_table_column_block VALUES('1', '8', '10'); ! INSERT INTO mx_table_column_block VALUES('6', '25', '10'); ! INSERT INTO mx_table_column_block VALUES('8', '26', '10'); ! INSERT INTO mx_table_column_block VALUES('7', '8', '10'); ! INSERT INTO mx_table_column_block VALUES('6', '4', '20'); ! INSERT INTO mx_table_column_block VALUES('5', '8', '10'); ! INSERT INTO mx_table_column_block VALUES('6', '19', '30'); ! INSERT INTO mx_table_column_block VALUES('5', '7', '20'); ! INSERT INTO mx_table_column_block VALUES('3', '13', '30'); ! INSERT INTO mx_table_column_block VALUES('3', '8', '10'); ! INSERT INTO mx_table_column_block VALUES('10', '15', '10'); ! INSERT INTO mx_table_column_block VALUES('9', '8', '10'); *************** *** 246,256 **** # Dumping data for table 'mx_table_column_templates' # ! INSERT INTO mx_table_column_templates VALUES("1", "Left", "40", "200", "2"); ! INSERT INTO mx_table_column_templates VALUES("2", "Main", "50", "100%", "2"); ! INSERT INTO mx_table_column_templates VALUES("3", "Main", "10", "100%", "3"); ! INSERT INTO mx_table_column_templates VALUES("4", "Right", "20", "200", "3"); ! INSERT INTO mx_table_column_templates VALUES("5", "Left", "10", "180", "4"); ! INSERT INTO mx_table_column_templates VALUES("6", "Middle", "20", "100%", "4"); ! INSERT INTO mx_table_column_templates VALUES("7", "Right", "30", "180", "4"); --- 245,255 ---- # Dumping data for table 'mx_table_column_templates' # ! INSERT INTO mx_table_column_templates VALUES('1', 'Left', '40', '200', '2'); ! INSERT INTO mx_table_column_templates VALUES('2', 'Main', '50', '100%', '2'); ! INSERT INTO mx_table_column_templates VALUES('3', 'Main', '10', '100%', '3'); ! INSERT INTO mx_table_column_templates VALUES('4', 'Right', '20', '200', '3'); ! INSERT INTO mx_table_column_templates VALUES('5', 'Left', '10', '180', '4'); ! INSERT INTO mx_table_column_templates VALUES('6', 'Middle', '20', '100%', '4'); ! INSERT INTO mx_table_column_templates VALUES('7', 'Right', '30', '180', '4'); *************** *** 276,300 **** # Dumping data for table 'mx_table_function' # ! INSERT INTO mx_table_function VALUES("8", "30", "phpBB Index", "phpBB Index Block", "mx_forum.php", ""); ! INSERT INTO mx_table_function VALUES("51", "50", "User Navigation Menu", "Site Navigation", "mx_menu_nav.php", ""); ! INSERT INTO mx_table_function VALUES("52", "50", "Page Navigation Menu", "Site Navigation", "mx_site_nav.php", ""); ! INSERT INTO mx_table_function VALUES("14", "30", "mxBB Polls", "mxBB Polls", "mx_poll.php", ""); ! INSERT INTO mx_table_function VALUES("6", "10", "Language Select", "Language Select Block", "mx_language.php", ""); ! INSERT INTO mx_table_function VALUES("7", "10", "Login", "Login Block", "mx_login.php", ""); ! INSERT INTO mx_table_function VALUES("12", "10", "Theme Select", "Theme Select Block", "mx_theme.php", ""); ! INSERT INTO mx_table_function VALUES("4", "10", "Google Search", "Google Search Block", "mx_google.php", ""); ! INSERT INTO mx_table_function VALUES("2", "30", "phpBB Announcements", "phpBB Announcements Block", "mx_announce.php", ""); ! INSERT INTO mx_table_function VALUES("13", "10", "Who is Online", "Who is Online Block", "mx_online.php", ""); ! INSERT INTO mx_table_function VALUES("11", "10", "Split Block", "Split Block Function - a block that puts subblocks side by side", "mx_multiple_blocks.php", ""); ! INSERT INTO mx_table_function VALUES("24", "20", "TextBlock (phpBB)", "BBcodes, html and smilies - defined by phpBB config", "mx_textblock_bbcode.php", ""); ! INSERT INTO mx_table_function VALUES("23", "20", "TextBlock (Html/wysiwyg)", "Plain html textblock, or featuring a wysiwyg editor", "mx_textblock_html.php", ""); ! INSERT INTO mx_table_function VALUES("22", "20", "TextBlock (Customized)", "Textblock, featuring block defined settings", "mx_textblock_multi.php", ""); ! INSERT INTO mx_table_function VALUES("31", "30", "Last Posts", "phpBB Last Posts Function", "mx_last_msg.php", ""); ! INSERT INTO mx_table_function VALUES("41", "30", "Statistics", "Site Statistics Function", "mx_statistics.php", ""); ! INSERT INTO mx_table_function VALUES("5", "10", "IncludeX", "Include a iframe, site, multimedia or file", "mx_includex.php", ""); ! INSERT INTO mx_table_function VALUES("3", "10", "DynamicBlock", "Dynamic block, defined by its block_id", "mx_dynamic.php", ""); ! INSERT INTO mx_table_function VALUES("10", "10", "Site Log", "Site Log monitor", "mx_site_log.php", ""); ! INSERT INTO mx_table_function VALUES("15", "10", "Site Search", "Site Search Block", "mx_search.php", ""); ! --- 275,298 ---- # Dumping data for table 'mx_table_function' # ! INSERT INTO mx_table_function VALUES('8', '30', 'phpBB Index', 'phpBB Index Block', 'mx_forum.php', ''); ! INSERT INTO mx_table_function VALUES('51', '50', 'User Navigation Menu', 'Site Navigation', 'mx_menu_nav.php', ''); ! INSERT INTO mx_table_function VALUES('52', '50', 'Page Navigation Menu', 'Site Navigation', 'mx_site_nav.php', ''); ! INSERT INTO mx_table_function VALUES('14', '30', 'mxBB Polls', 'mxBB Polls', 'mx_poll.php', ''); ! INSERT INTO mx_table_function VALUES('6', '10', 'Language Select', 'Language Select Block', 'mx_language.php', ''); ! INSERT INTO mx_table_function VALUES('7', '10', 'Login', 'Login Block', 'mx_login.php', ''); ! INSERT INTO mx_table_function VALUES('12', '10', 'Theme Select', 'Theme Select Block', 'mx_theme.php', ''); ! INSERT INTO mx_table_function VALUES('4', '10', 'Google Search', 'Google Search Block', 'mx_google.php', ''); ! INSERT INTO mx_table_function VALUES('2', '30', 'phpBB Announcements', 'phpBB Announcements Block', 'mx_announce.php', ''); ! INSERT INTO mx_table_function VALUES('13', '10', 'Who is Online', 'Who is Online Block', 'mx_online.php', ''); ! INSERT INTO mx_table_function VALUES('11', '10', 'Split Block', 'Split Block Function - a block that puts subblocks side by side', 'mx_multiple_blocks.php', ''); ! INSERT INTO mx_table_function VALUES('24', '20', 'TextBlock (phpBB)', 'BBcodes, html and smilies - defined by phpBB config', 'mx_textblock_bbcode.php', ''); ! INSERT INTO mx_table_function VALUES('23', '20', 'TextBlock (Html/wysiwyg)', 'Plain html textblock, or featuring a wysiwyg editor', 'mx_textblock_html.php', ''); ! INSERT INTO mx_table_function VALUES('22', '20', 'TextBlock (Customized)', 'Textblock, featuring block defined settings', 'mx_textblock_multi.php', ''); ! INSERT INTO mx_table_function VALUES('31', '30', 'Last Posts', 'phpBB Last Posts Function', 'mx_last_msg.php', ''); ! INSERT INTO mx_table_function VALUES('41', '30', 'Statistics', 'Site Statistics Function', 'mx_statistics.php', ''); ! INSERT INTO mx_table_function VALUES('5', '10', 'IncludeX', 'Include a iframe, site, multimedia or file', 'mx_includex.php', ''); ! INSERT INTO mx_table_function VALUES('3', '10', 'DynamicBlock', 'Dynamic block, defined by its block_id', 'mx_dynamic.php', ''); ! INSERT INTO mx_table_function VALUES('10', '10', 'Site Log', 'Site Log monitor', 'mx_site_log.php', ''); ! INSERT INTO mx_table_function VALUES('15', '10', 'Site Search', 'Site Search Block', 'mx_search.php', ''); *************** *** 323,331 **** # Dumping data for table 'mx_table_menu_categories' # ! INSERT INTO mx_table_menu_categories VALUES("8", "1", "Resources", "20", "c1affc0aaa", "", "0", "0", "0"); ! INSERT INTO mx_table_menu_categories VALUES("8", "3", "Home", "10", "eab7a16ce5", "", "1", "1", "0"); ! INSERT INTO mx_table_menu_categories VALUES("25", "4", "Core Blocks", "40", "a5abf5b8c4", "Demo Core blocks", "1", "0", "0"); ! INSERT INTO mx_table_menu_categories VALUES("25", "5", "TextBlocks", "50", "fa33545edc", "Demo TextBlocks", "0", "0", "0"); ! INSERT INTO mx_table_menu_categories VALUES("25", "6", "Modules", "60", "7dafcede48", "Modules Info", "0", "0", "0"); --- 321,329 ---- # Dumping data for table 'mx_table_menu_categories' # ! INSERT INTO mx_table_menu_categories VALUES('8', '1', 'Resources', '20', 'c1affc0aaa', '', '0', '0', '0'); ! INSERT INTO mx_table_menu_categories VALUES('8', '3', 'Home', '10', 'eab7a16ce5', '', '1', '1', '0'); ! INSERT INTO mx_table_menu_categories VALUES('25', '4', 'Core Blocks', '40', 'a5abf5b8c4', 'Demo Core blocks', '1', '0', '0'); ! INSERT INTO mx_table_menu_categories VALUES('25', '5', 'TextBlocks', '50', 'fa33545edc', 'Demo TextBlocks', '0', '0', '0'); ! INSERT INTO mx_table_menu_categories VALUES('25', '6', 'Modules', '60', '7dafcede48', 'Modules Info', '0', '0', '0'); *************** *** 361,379 **** # Dumping data for table 'mx_table_menu_nav' # ! INSERT INTO mx_table_menu_nav VALUES("7", "4", "Split Block", "Split block Demo", "", "0", "10", "043673560e", "icon_dot.gif", "", "", "0", "2", "0", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("8", "4", "Google Block", "Google Block Demo", "", "0", "20", "795e2489d7", "icon_dot.gif", "", "", "0", "21", "0", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("9", "4", "phpBB Announcements (if any)", "phpBB Announcements Demo", "", "0", "30", "29add66982", "icon_dot.gif", "", "", "0", "18", "0", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("10", "4", "IncludeX", "IncludeX Demo", "", "0", "40", "f7adaf1201", "icon_dot.gif", "", "", "0", "27", "0", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("11", "4", "phpBB Polls (if any)", "phpBB Polls Demo", "", "0", "50", "a80fe73aee", "icon_dot.gif", "", "", "0", "6", "0", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("12", "5", "phpBB TextBlock", "phpBB TextBlock Demo", "", "0", "10", "85d178caa8", "icon_dot.gif", "", "", "0", "1", "3", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("13", "5", "WYSIWYG TextBlock", "WYSIWYG TextBlock Demo", "", "0", "20", "51e2ddb3a7", "icon_dot.gif", "", "", "0", "10", "3", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("14", "5", "Custom TextBlock", "Custom TextBlock Demo", "", "0", "30", "22cb7a4f9f", "icon_dot.gif", "", "", "0", "9", "3", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("15", "6", "Modules Info", "Information", "", "0", "10", "630ce0e7f0", "icon_dot.gif", "", "", "0", "30", "3", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("5", "1", "phpBB Home", "", "http://www.phpbb.com", "0", "20", "a9ff189bf5", "icon_info.gif", "", "", "0", "0", "0", "0", "1"); ! INSERT INTO mx_table_menu_nav VALUES("3", "3", "Statistics", "Site Statistics", "", "0", "30", "98b16ec029", "icon_stats.gif", "", "", "0", "0", "4", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("4", "1", "MX-Publisher Home", "", "http://www.mx-publisher.com", "0", "10", "1f171544ea", "icon_info.gif", "", "", "0", "0", "0", "0", "1"); ! INSERT INTO mx_table_menu_nav VALUES("6", "1", "Demo Pages", "On this page are several demo blocks located", "", "0", "30", "fb028ba583", "icon_dot.gif", "", "", "0", "0", "3", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("1", "3", "Home", "Back to home", "", "0", "10", "bb51181967", "icon_home.gif", "", "", "0", "0", "1", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("2", "3", "Forum", "phpBB Forum Index", "", "0", "20", "a33e401abc", "icon_forum.gif", "", "", "0", "0", "2", "0", "0"); --- 359,377 ---- # Dumping data for table 'mx_table_menu_nav' # ! INSERT INTO mx_table_menu_nav VALUES('7', '4', 'Split Block', 'Split block Demo', '', '0', '10', '043673560e', 'icon_dot.gif', '', '', '0', '2', '0', '0', '0'); ! INSERT INTO mx_table_menu_nav VALUES('8', '4', 'Google Block', 'Google Block Demo', '', '0', '20', '795e2489d7', 'icon_dot.gif', '', '', '0', '21', '0', '0', '0'); ! INSERT INTO mx_table_menu_nav VALUES('9', '4', 'phpBB Announcements (if any)', 'phpBB Announcements Demo', '', '0', '30', '29add66982', 'icon_dot.gif', '', '', '0', '18', '0', '0', '0'); ! INSERT INTO mx_table_menu_nav VALUES('10', '4', 'IncludeX', 'IncludeX Demo', '', '0', '40', 'f7adaf1201', 'icon_dot.gif', '', '', '0', '27', '0', '0', '0'); ! INSERT INTO mx_table_menu_nav VALUES('11', '4', 'phpBB Polls (if any)', 'phpBB Polls Demo', '', '0', '50', 'a80fe73aee', 'icon_dot.gif', '', '', '0', '6', '0', '0', '0'); ! INSERT INTO mx_table_menu_nav VALUES('12', '5', 'phpBB TextBlock', 'phpBB TextBlock Demo', '', '0', '10', '85d178caa8', 'icon_dot.gif', '', '', '0', '1', '3', '0', '0'); ! INSERT INTO mx_table_menu_nav VALUES('13', '5', 'WYSIWYG TextBlock', 'WYSIWYG TextBlock Demo', '', '0', '20', '51e2ddb3a7', 'icon_dot.gif', '', '', '0', '10', '3', '0', '0'); ! INSERT INTO mx_table_menu_nav VALUES('14', '5', 'Custom TextBlock', 'Custom TextBlock Demo', '', '0', '30', '22cb7a4f9f', 'icon_dot.gif', '', '', '0', '9', '3', '0', '0'); ! INSERT INTO mx_table_menu_nav VALUES('15', '6', 'Modules Info', 'Information', '', '0', '10', '630ce0e7f0', 'icon_dot.gif', '', '', '0', '30', '3', '0', '0'); ! INSERT INTO mx_table_menu_nav VALUES('5', '1', 'phpBB Home', '', 'http://www.phpbb.com', '0', '20', 'a9ff189bf5', 'icon_info.gif', '', '', '0', '0', '0', '0', '1'); ! INSERT INTO mx_table_menu_nav VALUES('3', '3', 'Statistics', 'Site Statistics', '', '0', '30', '98b16ec029', 'icon_stats.gif', '', '', '0', '0', '4', '0', '0'); ! INSERT INTO mx_table_menu_nav VALUES('4', '1', 'MX-Publisher Home', '', 'http://www.mx-publisher.com', '0', '10', '1f171544ea', 'icon_info.gif', '', '', '0', '0', '0', '0', '1'); ! INSERT INTO mx_table_menu_nav VALUES('6', '1', 'Demo Pages', 'On this page are several demo blocks located', '', '0', '30', 'fb028ba583', 'icon_dot.gif', '', '', '0', '0', '3', '0', '0'); ! INSERT INTO mx_table_menu_nav VALUES('1', '3', 'Home', 'Back to home', '', '0', '10', 'bb51181967', 'icon_home.gif', '', '', '0', '0', '1', '0', '0'); ! INSERT INTO mx_table_menu_nav VALUES('2', '3', 'Forum', 'phpBB Forum Index', '', '0', '20', 'a33e401abc', 'icon_forum.gif', '', '', '0', '0', '2', '0', '0'); *************** *** 405,413 **** #INSERT INTO `mx_table_module` (`module_id`, `module_name`, `module_path`, `module_desc`, `module_include_admin`, `module_version`, `module_copy`) VALUES (50, 'Navigation Menu', 'modules/mx_navmenu/', 'MX-Publisher Site Navigation', '', 'mxBB Core Module', 'Original mxBB <i>Navigation Menu</i> module by <a href="http://www.mx-publisher.com" target="_blank">Jon</a>'); ! INSERT INTO mx_table_module VALUES("10", "Core Blocks", "modules/mx_coreblocks/", "MX-Publisher Core Blocks", "", "mxBB Core Module", "Original mxBB <i>Core Blocks</i> module by <a href=\"http://www.mx-publisher.com\" target=\"_blank\">The mxBB Development Team</a>"); ! INSERT INTO mx_table_module VALUES("20", "Textblocks", "modules/mx_textblocks/", "MX-Publisher Textblocks", "", "mxBB Core Module", "Original mxBB <i>Textblocks</i> module by <a href=\"http://www.mx-publisher.com\" target=\"_blank\">Jon</a>"); ! INSERT INTO mx_table_module VALUES("30", "phpBB2 Blocks", "modules/mx_phpbb2blocks/", "MX-Publisher phpBB2 blocks", "", "mxBB Core Module", "Original mxBB <i>phpBB2 Blocks</i> module by <a href=\"http://www.mx-publisher.com\" target=\"_blank\"> The mxBB Development Team</a>"); ! INSERT INTO mx_table_module VALUES("40", "Users and Groups", "modules/mx_users/", "Users and Group adminCP", "1", "mxBB Core Module", "Based on original phpBB <i>Admin Tool MODs</i> by Adam Alkins, Omar Ramadan & wGEric :: Adapted for mxBB by <a href=\"http://www.mx-publisher.com\" target=\"_blank\">Jon</a>"); ! INSERT INTO mx_table_module VALUES("50", "Navigation Menu", "modules/mx_navmenu/", "MX-Publisher Site Navigation", "", "mxBB Core Module", "Original mxBB <i>Navigation Menu</i> module by <a href=\"http://www.mx-publisher.com\" target=\"_blank\">Jon</a>"); # --- 403,411 ---- #INSERT INTO `mx_table_module` (`module_id`, `module_name`, `module_path`, `module_desc`, `module_include_admin`, `module_version`, `module_copy`) VALUES (50, 'Navigation Menu', 'modules/mx_navmenu/', 'MX-Publisher Site Navigation', '', 'mxBB Core Module', 'Original mxBB <i>Navigation Menu</i> module by <a href="http://www.mx-publisher.com" target="_blank">Jon</a>'); ! INSERT INTO mx_table_module VALUES('10', 'Core Blocks', 'modules/mx_coreblocks/', 'MX-Publisher Core Blocks', '', 'mxBB Core Module', 'Original mxBB <i>Core Blocks</i> module by <a href=\'http://www.mx-publisher.com\' target=\'_blank\'>The mxBB Development Team</a>'); ! INSERT INTO mx_table_module VALUES('20', 'Textblocks', 'modules/mx_textblocks/', 'MX-Publisher Textblocks', '', 'mxBB Core Module', 'Original mxBB <i>Textblocks</i> module by <a href=\'http://www.mx-publisher.com\' target=\'_blank\'>Jon</a>'); ! INSERT INTO mx_table_module VALUES('30', 'phpBB2 Blocks', 'modules/mx_phpbb2blocks/', 'MX-Publisher phpBB2 blocks', '', 'mxBB Core Module', 'Original mxBB <i>phpBB2 Blocks</i> module by <a href=\'http://www.mx-publisher.com\' target=\'_blank\'> The mxBB Development Team</a>'); ! INSERT INTO mx_table_module VALUES('40', 'Users and Groups', 'modules/mx_users/', 'Users and Group adminCP', '1', 'mxBB Core Module', 'Based on original phpBB <i>Admin Tool MODs</i> by Adam Alkins, Omar Ramadan & wGEric :: Adapted for mxBB by <a href=\'http://www.mx-publisher.com\' target=\'_blank\'>Jon</a>'); ! INSERT INTO mx_table_module VALUES('50', 'Navigation Menu', 'modules/mx_navmenu/', 'MX-Publisher Site Navigation', '', 'mxBB Core Module', 'Original mxBB <i>Navigation Menu</i> module by <a href=\'http://www.mx-publisher.com\' target=\'_blank\'>Jon</a>'); # *************** *** 447,455 **** # Dumping data for table 'mx_table_page' # ! INSERT INTO mx_table_page VALUES("1", "Home", "This is the startpage", "0", "", "10","icon_home.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("2", "Forum", "This is the phpBB Forum startpage", "0", "", "20","icon_forum.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "overall_header_navigation_phpbb.tpl", "", "", "0", "a:1:{i:0;s:0:\"\";}", "1"); ! INSERT INTO mx_table_page VALUES("3", "Demo Page", "Block Demos", "0", "", "30","icon_docs.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("4", "Sitestats", "Sitestats page", "0", "", "40","icon_stats.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("5", "Site Search", "Site Search page", "0", "", "50","icon_search.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); --- 445,453 ---- # Dumping data for table 'mx_table_page' # ! INSERT INTO mx_table_page VALUES('1', 'Home', 'This is the startpage', '0', '', '10','icon_home.gif', '', '', '', '', '1', '0', '0', '0', '-1', '-1', '', '', '', '0', 'a:1:{i:0;s:0:\'\';}', '-1'); ! INSERT INTO mx_table_page VALUES('2', 'Forum', 'This is the phpBB Forum startpage', '0', '', '20','icon_forum.gif', '', '', '', '', '1', '0', '0', '0', '-1', '-1', 'overall_header_navigation_phpbb.tpl', '', '', '0', 'a:1:{i:0;s:0:\'\';}', '1'); ! INSERT INTO mx_table_page VALUES('3', 'Demo Page', 'Block Demos', '0', '', '30','icon_docs.gif', '', '', '', '', '1', '0', '0', '0', '-1', '-1', '', '', '', '0', 'a:1:{i:0;s:0:\'\';}', '-1'); ! INSERT INTO mx_table_page VALUES('4', 'Sitestats', 'Sitestats page', '0', '', '40','icon_stats.gif', '', '', '', '', '1', '0', '0', '0', '-1', '-1', '', '', '', '0', 'a:1:{i:0;s:0:\'\';}', '-1'); ! INSERT INTO mx_table_page VALUES('5', 'Site Search', 'Site Search page', '0', '', '50','icon_search.gif', '', '', '', '', '1', '0', '0', '0', '-1', '-1', '', '', '', '0', 'a:1:{i:0;s:0:\'\';}', '-1'); *************** *** 470,477 **** # Dumping data for table 'mx_table_page_templates' # ! INSERT INTO mx_table_page_templates VALUES("1", "NONE"); ! INSERT INTO mx_table_page_templates VALUES("2", "Two-Columns left"); ! INSERT INTO mx_table_page_templates VALUES("3", "Two-Columns right"); ! INSERT INTO mx_table_page_templates VALUES("4", "Three-Columns"); --- 468,475 ---- # Dumping data for table 'mx_table_page_templates' # ! INSERT INTO mx_table_page_templates VALUES('1', 'NONE'); ! INSERT INTO mx_table_page_templates VALUES('2', 'Two-Columns left'); ! INSERT INTO mx_table_page_templates VALUES('3', 'Two-Columns right'); ! INSERT INTO mx_table_page_templates VALUES('4', 'Three-Columns'); *************** *** 498,566 **** # Dumping data for table 'mx_table_parameter' # ! INSERT INTO mx_table_parameter VALUES("1", "2", "announce_nbr_display", "Number", "1", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("2", "2", "announce_nbr_days", "Number", "14", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("3", "2", "announce_display", "Boolean", "TRUE", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("4", "2", "announce_display_sticky", "Boolean", "TRUE", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("5", "2", "announce_display_normal", "Boolean", "FALSE", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("7", "2", "announce_img", "Text", "thumb_globe.gif", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("8", "2", "announce_img_sticky", "Text", "thumb_globe.gif", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("9", "2", "announce_img_normal", "Text", "thumb_globe.gif", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("6", "2", "announce_display_global", "Boolean", "TRUE", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("10", "2", "announce_img_global", "Text", "thumb_globe.gif", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("11", "2", "announce_forum", "Function", "", "get_list_multiple(\"{parameter_id}[]\", FORUMS_TABLE, \'forum_id\', \'forum_name\', \"{parameter_value}\", TRUE)", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("13", "14", "Poll_Display", "Function", "0", "poll_select( {parameter_value}, \"{parameter_id}\" )", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("36", "14", "poll_forum", "Function", "", "get_list_multiple(\"{parameter_id}[]\", FORUMS_TABLE, \'forum_id\', \'forum_name\', \"{parameter_value}\", TRUE)", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("15", "24", "Text", "phpBBTextBlock", "Insert your text here", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("16", "23", "Html", "WysiwygTextBlock", "Entre your Html code here", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("17", "31", "Last_Msg_Number_Title", "Number", "15", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("18", "31", "Last_Msg_Display_Date", "Boolean", "TRUE", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("19", "31", "Last_Msg_Title_Length", "Number", "30", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("20", "31", "Last_Msg_Target", "Values", "_blank", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("21", "31", "Last_Msg_Align", "Values", "left", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("22", "31", "Last_Msg_Display_Forum", "Boolean", "TRUE", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("37", "31", "Last_Msg_forum", "Function", "", "get_list_multiple(\"{parameter_id}[]\", FORUMS_TABLE, \'forum_id\', \'forum_name\', \"{parameter_value}\", TRUE)", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("38", "31", "Last_Msg_Display_Last_Author", "Boolean", "TRUE", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("39", "31", "Last_Msg_Display_Author", "Boolean", "FALSE", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("40", "31", "Last_Msg_Display_Icon_View", "Boolean", "TRUE", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("50", "22", "Text", "CustomizedTextBlock", "Enter your block text here", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("51", "22", "text_style", "Text", "none", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("52", "22", "block_style", "Boolean", "TRUE", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("53", "22", "title_style", "Boolean", "TRUE", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("91", "10", "log_filter_date", "Menu_single_select", "1 month", "a:12:{i:0;s:8:\"no limit\";i:1;s:5:\"1 day\";i:2;s:6:\"2 days\";i:3;s:6:\"3 days\";i:4;s:6:\"1 week\";i:5;s:7:\"2 weeks\";i:6;s:7:\"3 weeks\";i:7;s:7:\"1 month\";i:8;s:8:\"2 months\";i:9;s:8:\"3 months\";i:10;s:8:\"6 months\";i:11;s:6:\"1 year\";}", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("60", "11", "block_ids", "Function", "1,2,3", "get_list_multiple( \"{parameter_id}[]\", BLOCK_TABLE, \'block_id\', \'block_title\', \"{parameter_value}\", TRUE, \'block_desc\')", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("61", "11", "block_sizes", "Text", "20%,30%,*", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("62", "11", "space_between", "Number", "4", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("80", "3", "default_block_id", "Function", "0", "get_list_formatted(\"block_list\",\"{parameter_value}\",\"{parameter_id}[]\")", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("70", "5", "x_mode", "Menu_single_select", "x_iframe", "a:6:{i:0;s:8:\"x_listen\";i:1;s:8:\"x_iframe\";i:2;s:10:\"x_textfile\";i:3;s:12:\"x_multimedia\";i:4;s:5:\"x_pic\";i:5;s:8:\"x_format\";}", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("71", "5", "x_1", "Text", "/docs", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("72", "5", "x_2", "Text", "325", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("73", "5", "x_3", "Text", "", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("66", "51", "Nav menu", "nav_menu", "", "", "0", "10"); ! INSERT INTO mx_table_parameter VALUES("93", "51", "menu_custom_tpl", "Text", "", "", "0", "20"); ! INSERT INTO mx_table_parameter VALUES("63", "51", "menu_display_mode", "Radio_single_select", "Vertical", "a:3:{i:0;s:8:\"Vertical\";i:1;s:10:\"Horizontal\";i:2;s:18:\"Overall_navigation\";}", "0", "30"); ! INSERT INTO mx_table_parameter VALUES("100", "52", "Site menu", "site_menu", "", "", "0", "10"); ! INSERT INTO mx_table_parameter VALUES("101", "52", "menu_custom_tpl", "Text", "", "", "0", "20"); ! INSERT INTO mx_table_parameter VALUES("102", "52", "menu_display_mode", "Radio_single_select", "Overall_navigation", "a:3:{i:0;s:8:\"Vertical\";i:1;s:10:\"Horizontal\";i:2;s:18:\"Overall_navigation\";}", "0", "30"); ! INSERT INTO mx_table_parameter VALUES("92", "10", "numOfEvents", "Number", "5", "", "0", "0"); ! INSERT INTO mx_table_parameter VALUES("57", "22", "allow_smilies", "Boolean", "TRUE", "", "1", "0"); ! INSERT INTO mx_table_parameter VALUES("54", "22", "allow_html", "Boolean", "TRUE", "", "1", "0"); ! INSERT INTO mx_table_parameter VALUES("56", "22", "allow_bbcode", "Boolean", "TRUE", "", "1", "0"); ! INSERT INTO mx_table_parameter VALUES("55", "22", "html_tags", "Text", "b,i,u", "", "1", "0"); ! INSERT INTO mx_table_parameter VALUES("95", "31", "msg_filter_date", "Function", "5", "get_list_static(\"{parameter_id}[]\",array(\"no limit\", \"1 day\", \"2 days\", \"3 days\", \"1 week\", \"2 weeks\", \"3 weeks\", \"1 month\", \"2 months\", \"3 months\", \"6 months\", \"1 year\"),\"{parameter_value}\")", "0", "0"); --- 496,564 ---- # Dumping data for table 'mx_table_parameter' # ! INSERT INTO mx_table_parameter VALUES('1', '2', 'announce_nbr_display', 'Number', '1', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('2', '2', 'announce_nbr_days', 'Number', '14', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('3', '2', 'announce_display', 'Boolean', 'TRUE', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('4', '2', 'announce_display_sticky', 'Boolean', 'TRUE', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('5', '2', 'announce_display_normal', 'Boolean', 'FALSE', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('7', '2', 'announce_img', 'Text', 'thumb_globe.gif', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('8', '2', 'announce_img_sticky', 'Text', 'thumb_globe.gif', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('9', '2', 'announce_img_normal', 'Text', 'thumb_globe.gif', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('6', '2', 'announce_display_global', 'Boolean', 'TRUE', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('10', '2', 'announce_img_global', 'Text', 'thumb_globe.gif', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('11', '2', 'announce_forum', 'Function', '', 'get_list_multiple(\'{parameter_id}[]\', FORUMS_TABLE, \'forum_id\', \'forum_name\', \'{parameter_value}\', TRUE)', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('13', '14', 'Poll_Display', 'Function', '0', 'poll_select( {parameter_value}, \'{parameter_id}\' )', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('36', '14', 'poll_forum', 'Function', '', 'get_list_multiple(\'{parameter_id}[]\', FORUMS_TABLE, \'forum_id\', \'forum_name\', \'{parameter_value}\', TRUE)', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('15', '24', 'Text', 'phpBBTextBlock', 'Insert your text here', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('16', '23', 'Html', 'WysiwygTextBlock', 'Entre your Html code here', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('17', '31', 'Last_Msg_Number_Title', 'Number', '15', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('18', '31', 'Last_Msg_Display_Date', 'Boolean', 'TRUE', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('19', '31', 'Last_Msg_Title_Length', 'Number', '30', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('20', '31', 'Last_Msg_Target', 'Values', '_blank', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('21', '31', 'Last_Msg_Align', 'Values', 'left', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('22', '31', 'Last_Msg_Display_Forum', 'Boolean', 'TRUE', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('37', '31', 'Last_Msg_forum', 'Function', '', 'get_list_multiple(\'{parameter_id}[]\', FORUMS_TABLE, \'forum_id\', \'forum_name\', \'{parameter_value}\', TRUE)', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('38', '31', 'Last_Msg_Display_Last_Author', 'Boolean', 'TRUE', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('39', '31', 'Last_Msg_Display_Author', 'Boolean', 'FALSE', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('40', '31', 'Last_Msg_Display_Icon_View', 'Boolean', 'TRUE', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('50', '22', 'Text', 'CustomizedTextBlock', 'Enter your block text here', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('51', '22', 'text_style', 'Text', 'none', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('52', '22', 'block_style', 'Boolean', 'TRUE', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('53', '22', 'title_style', 'Boolean', 'TRUE', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('91', '10', 'log_filter_date', 'Menu_single_select', '1 month', 'a:12:{i:0;s:8:\'no limit\';i:1;s:5:\'1 day\';i:2;s:6:\'2 days\';i:3;s:6:\'3 days\';i:4;s:6:\'1 week\';i:5;s:7:\'2 weeks\';i:6;s:7:\'3 weeks\';i:7;s:7:\'1 month\';i:8;s:8:\'2 months\';i:9;s:8:\'3 months\';i:10;s:8:\'6 months\';i:11;s:6:\'1 year\';}', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('60', '11', 'block_ids', 'Function', '1,2,3', 'get_list_multiple( \'{parameter_id}[]\', BLOCK_TABLE, \'block_id\', \'block_title\', \'{parameter_value}\', TRUE, \'block_desc\')', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('61', '11', 'block_sizes', 'Text', '20%,30%,*', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('62', '11', 'space_between', 'Number', '4', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('80', '3', 'default_block_id', 'Function', '0', 'get_list_formatted(\'block_list\',\'{parameter_value}\',\'{parameter_id}[]\')', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('70', '5', 'x_mode', 'Menu_single_select', 'x_iframe', 'a:6:{i:0;s:8:\'x_listen\';i:1;s:8:\'x_iframe\';i:2;s:10:\'x_textfile\';i:3;s:12:\'x_multimedia\';i:4;s:5:\'x_pic\';i:5;s:8:\'x_format\';}', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('71', '5', 'x_1', 'Text', '/docs', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('72', '5', 'x_2', 'Text', '325', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('73', '5', 'x_3', 'Text', '', '', '0', '0'); ! INSERT INTO mx_table_parameter VALUES('66', '51', 'Nav menu', 'nav_menu', '', '', '0', '10'); ! INSERT INTO mx_table_parameter VALUES('93', '51', 'menu_custom_tpl', 'Text', '', '', '0', '20'); ! INSERT INTO mx_table_parameter VALUES('63', '51', 'menu_display_mode', 'Radio_single_select', 'Vertical', 'a:3:{i:0;s:8:\'Vertical\';i:1;s:10:\'Horizontal\';i:2;s:18:\'Overall_navigation\';}', '0', '30'); ! INSERT INTO mx_table_parameter VALUES('100', '52', 'Site menu', 'site_menu', '', '', '0', '10'); ! INSERT INTO mx_table_parameter VALUES('101', '52', 'menu_custom_tpl', 'Text', '', '', '0', '20'); ! INSERT INTO mx_table_parameter VALUES('102', '52', 'menu_display_mode', 'Radio_single_select', 'Overall_navigation', 'a:3:{i:0;s:8:\'Vertical\';i:1;s:1... [truncated message content] |
|
From: MW <jo...@us...> - 2008-02-09 12:44:37
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26721/admin Modified Files: index.php admin_mx_block_cp.php admin_mx_portal.php pagestart.php index_new.php admin_mx_styles.php admin_mx_words.php admin_mx_chkobjs.php admin_mx_preview.php admin_mx_module.php admin_mx_smilies.php admin_mx_module_cp.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: admin_mx_chkobjs.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_chkobjs.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** admin_mx_chkobjs.php 5 Feb 2008 14:51:27 -0000 1.25 --- admin_mx_chkobjs.php 9 Feb 2008 12:44:32 -0000 1.26 *************** *** 91,106 **** // Check to see if we need to show the table selection box. // ! if( isset($HTTP_POST_VARS['check_mode']) || isset($HTTP_GET_VARS['check_mode']) ) { ! $check_mode = ( isset($HTTP_POST_VARS['check_mode']) ? $HTTP_POST_VARS['check_mode'] : $HTTP_GET_VARS['check_mode'] ); } else { ! if( !isset($HTTP_GET_VARS['mode']) ) { $select_options = '<select name="check_mode">'; for( $i=0; $i < count($check_args); $i++ ) { ! $selected = ( $i == $HTTP_GET_VARS['table'] ? ' selected="selected"' : '' ); $select_options .= '<option value="'.$i.'"'.$selected.'>'.$check_args[$i]['table'].'</option>'; } --- 91,106 ---- // Check to see if we need to show the table selection box. // ! if ($mx_request_vars->is_request('check_mode')) { ! $check_mode = $mx_request_vars->request('check_mode'); } else { ! if (!$mx_request_vars->is_get('mode')) { $select_options = '<select name="check_mode">'; for( $i=0; $i < count($check_args); $i++ ) { ! $selected = ( $i == $mx_request_vars->get('table', MX_TYPE_INT) ? ' selected="selected"' : '' ); $select_options .= '<option value="'.$i.'"'.$selected.'>'.$check_args[$i]['table'].'</option>'; } *************** *** 115,123 **** } ! $mode = $HTTP_GET_VARS['mode']; ! $tb = $HTTP_GET_VARS['table']; $table = $check_args[$tb]['table']; ! $val0 = $HTTP_GET_VARS['val0']; ! $val1 = $HTTP_GET_VARS['val1']; $tab0 = $check_args[$tb]['fkeys'][0][0]; $key0 = $check_args[$tb]['fkeys'][0][1]; --- 115,123 ---- } ! $mode = $mx_request_vars->get('mode', MX_TYPE_NO_TAGS); ! $tb = $mx_request_vars->get('table', MX_TYPE_INT); $table = $check_args[$tb]['table']; ! $val0 = $mx_request_vars->get('val0', MX_TYPE_NO_TAGS); ! $val1 = $mx_request_vars->get('val1', MX_TYPE_NO_TAGS); $tab0 = $check_args[$tb]['fkeys'][0][0]; $key0 = $check_args[$tb]['fkeys'][0][1]; Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** admin_mx_module_cp.php 4 Feb 2008 15:44:45 -0000 1.20 --- admin_mx_module_cp.php 9 Feb 2008 12:44:32 -0000 1.21 *************** *** 12,17 **** if( !empty($setmodules) ) { ! $file = basename(__FILE__); ! $module['2_CP']['2_2_ModuleCP'] = 'admin/' . $file; return; } --- 12,16 ---- if( !empty($setmodules) ) { ! $module['2_CP']['2_2_ModuleCP'] = 'admin/' . basename(__FILE__); return; } *************** *** 84,90 **** $sort_cookie = !empty($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) ? explode(",", $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) : array(); ! if ( isset( $HTTP_POST_VARS['include_block_quickedit'] ) ) { ! switch ( $HTTP_POST_VARS['include_block_quickedit'] ) { case '0': --- 83,89 ---- $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')) { ! switch ($mx_request_vars->post('include_block_quickedit', MX_TYPE_NO_TAGS)) { case '0': *************** *** 103,109 **** } ! if ( isset( $HTTP_POST_VARS['include_block_private'] ) ) { ! switch ( $HTTP_POST_VARS['include_block_private'] ) { case '0': --- 102,108 ---- } ! if ($mx_request_vars->is_post('include_block_private')) { ! switch ($mx_request_vars->post('include_block_private', MX_TYPE_NO_TAGS) ) { case '0': *************** *** 123,129 **** /* ! if ( isset( $HTTP_POST_VARS['include_all'] ) ) { ! switch ( $HTTP_POST_VARS['include_all'] ) { case '0': --- 122,128 ---- /* ! if ($mx_request_vars->is_post('include_all')) { ! switch ( $mx_request_vars->post('include_all', MX_TYPE_NO_TAGS)) { case '0': Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** index.php 5 Feb 2008 14:51:27 -0000 1.40 --- index.php 9 Feb 2008 12:44:32 -0000 1.41 *************** *** 22,25 **** --- 22,26 ---- $phpEx = substr(strrchr(__FILE__, '.'), 1); $no_page_header = TRUE; + require('./pagestart.' . $phpEx); *************** *** 86,90 **** // Generate relevant output // ! if( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'left' ) { include('./page_header_admin.'.$phpEx); --- 87,91 ---- // 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); *************** *** 93,99 **** 'body' => 'admin/index_navigate.tpl') ); ! $admincp_nav_icon_url = PORTAL_URL . $images['mx_graphics']['admin_icons']; ! $template->assign_vars(array( 'U_PHPBB_ROOT_PATH' => PHPBB_URL, --- 94,100 ---- 'body' => 'admin/index_navigate.tpl') ); ! $admincp_nav_icon_url = PORTAL_URL . $images['mx_graphics']['admin_icons']; ! $template->assign_vars(array( 'U_PHPBB_ROOT_PATH' => PHPBB_URL, *************** *** 117,125 **** "L_PREVIEW_FORUM" => $lang['Preview_forum']) ); ! // // Read Portal configuration // - // MX Addon ------------------------------------ $module_portal = read_admin('.'); --- 118,125 ---- "L_PREVIEW_FORUM" => $lang['Preview_forum']) ); ! // // Read Portal configuration // // MX Addon ------------------------------------ $module_portal = read_admin('.'); *************** *** 128,132 **** )); // END ------------------------------------------ ! ksort($module_portal); --- 128,132 ---- )); // END ------------------------------------------ ! ksort($module_portal); *************** *** 356,360 **** include('./page_footer_admin.'.$phpEx); } ! elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' ) { --- 356,360 ---- include('./page_footer_admin.'.$phpEx); } ! elseif ($mx_request_vars->is_get('pane') && $mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'right' ) { Index: admin_mx_preview.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_preview.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_preview.php 4 Feb 2008 15:44:45 -0000 1.2 --- admin_mx_preview.php 9 Feb 2008 12:44:32 -0000 1.3 *************** *** 31,38 **** // 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 --- 31,37 ---- // Set mode // ! if ($mx_request_vars->is_request('mode')) { ! $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS); } else Index: admin_mx_smilies.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_smilies.php 13 Sep 2007 09:42:18 -0000 1.2 --- admin_mx_smilies.php 9 Feb 2008 12:44:32 -0000 1.3 *************** *** 40,46 **** // Load default header // ! if( isset($HTTP_GET_VARS['export_pack']) ) { ! if ( $HTTP_GET_VARS['export_pack'] == "send" ) { $no_page_header = true; --- 40,46 ---- // Load default header // ! if ($mx_request_vars->is_get('export_pack')) { ! if ($mx_request_vars->get('export_pack', MX_TYPE_NO_TAGS) == "send" ) { $no_page_header = true; *************** *** 52,56 **** require($mx_root_path . 'extension.inc'); ! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false; $no_page_header = $cancel; --- 52,56 ---- require($mx_root_path . 'extension.inc'); ! $cancel = $mx_request_vars->is_post('cancel'); $no_page_header = $cancel; *************** *** 64,68 **** $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); ! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false; $no_page_header = $cancel; require('./pagestart.' . $phpEx); --- 64,68 ---- $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); ! $cancel = $mx_request_vars->is_post('cancel'); $no_page_header = $cancel; require('./pagestart.' . $phpEx); *************** *** 81,87 **** // Check to see what mode we should operate in. // ! 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); } --- 81,87 ---- // Check to see what mode we should operate in. // ! if ($mx_request_vars->is_request('mode')) { ! $mode = $mx_request_vars->request('mode',MX_TYPE_NO_TAGS); $mode = htmlspecialchars($mode); } *************** *** 120,131 **** // Select main mode // ! if( isset($HTTP_GET_VARS['import_pack']) || isset($HTTP_POST_VARS['import_pack']) ) { // // Import a list a "Smiley Pack" // ! $smile_pak = ( isset($HTTP_POST_VARS['smile_pak']) ) ? $HTTP_POST_VARS['smile_pak'] : $HTTP_GET_VARS['smile_pak']; ! $clear_current = ( isset($HTTP_POST_VARS['clear_current']) ) ? $HTTP_POST_VARS['clear_current'] : $HTTP_GET_VARS['clear_current']; ! $replace_existing = ( isset($HTTP_POST_VARS['replace']) ) ? $HTTP_POST_VARS['replace'] : $HTTP_GET_VARS['replace']; if ( !empty($smile_pak) ) --- 120,131 ---- // Select main mode // ! if ($mx_request_vars->is_request('import_pack')) { // // Import a list a "Smiley Pack" // ! $smile_pak = $mx_request_vars->request('smile_pak', MX_TYPE_NO_TAGS); ! $clear_current = $mx_request_vars->request('clear_current', MX_TYPE_NO_TAGS); ! $replace_existing = $mx_request_vars->request('replace', MX_TYPE_NO_TAGS); if ( !empty($smile_pak) ) *************** *** 256,265 **** } } ! else if( isset($HTTP_POST_VARS['export_pack']) || isset($HTTP_GET_VARS['export_pack']) ) { // // Export our smiley config as a smiley pak... // ! if ( $HTTP_GET_VARS['export_pack'] == "send" ) { $sql = "SELECT * --- 256,265 ---- } } ! else if ($mx_request_vars->is_request('export_pack')) { // // Export our smiley config as a smiley pak... // ! if ($mx_request_vars->get('export_pack', MX_TYPE_NO_TAGS) == "send" ) { $sql = "SELECT * *************** *** 293,297 **** } ! else if( isset($HTTP_POST_VARS['add']) || isset($HTTP_GET_VARS['add']) ) { // --- 293,297 ---- } ! else if ($mx_request_vars->is_request('add')) { // *************** *** 340,349 **** // ! $smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id']; ! $smiley_id = intval($smiley_id); ! ! $confirm = isset($HTTP_POST_VARS['confirm']); ! if( $confirm ) { $sql = "DELETE FROM " . SMILIES_TABLE . " --- 340,346 ---- // ! $smiley_id = $mx_request_vars->request('id', MX_TYPE_INT); ! if ($mx_request_vars->is_post('confirm')) { $sql = "DELETE FROM " . SMILIES_TABLE . " *************** *** 387,392 **** // ! $smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id']; ! $smiley_id = intval($smiley_id); $sql = "SELECT * --- 384,388 ---- // ! $smiley_id = $mx_request_vars->request('id', MX_TYPE_INT); $sql = "SELECT * *************** *** 455,463 **** // accept the data we are looking for. // ! $smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? trim($HTTP_POST_VARS['smile_code']) : ''; ! $smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? trim($HTTP_POST_VARS['smile_url']) : ''; $smile_url = phpBB2::phpbb_ltrim(basename($smile_url), "'"); ! $smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? htmlspecialchars(trim($HTTP_POST_VARS['smile_emotion'])) : ''; ! $smile_id = ( isset($HTTP_POST_VARS['smile_id']) ) ? intval($HTTP_POST_VARS['smile_id']) : 0; $smile_code = trim($smile_code); $smile_url = trim($smile_url); --- 451,459 ---- // accept the data we are looking for. // ! $smile_code = $mx_request_vars->post('smile_code'); ! $smile_url = $mx_request_vars->post('smile_url', MX_TYPE_NO_TAGS); $smile_url = phpBB2::phpbb_ltrim(basename($smile_url), "'"); ! $smile_emotion = $mx_request_vars->post('smile_emotion', MX_TYPE_NO_HTML); ! $smile_id = $mx_request_vars->post('smile_id', MX_TYPE_INT, 0); $smile_code = trim($smile_code); $smile_url = trim($smile_url); *************** *** 500,507 **** // we recieve and process is only the data we are looking for. // ! $smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? $HTTP_POST_VARS['smile_code'] : ''; ! $smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : ''; $smile_url = phpBB2::phpbb_ltrim(basename($smile_url), "'"); ! $smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? htmlspecialchars(trim($HTTP_POST_VARS['smile_emotion'])) : ''; $smile_code = trim($smile_code); $smile_url = trim($smile_url); --- 496,503 ---- // we recieve and process is only the data we are looking for. // ! $smile_code = $mx_request_vars->post('smile_code'); ! $smile_url = $mx_request_vars->post('smile_url'); $smile_url = phpBB2::phpbb_ltrim(basename($smile_url), "'"); ! $smile_emotion = $mx_request_vars->post('smile_emotion', MX_TYPE_NO_HTML); $smile_code = trim($smile_code); $smile_url = trim($smile_url); Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** admin_mx_module.php 4 Feb 2008 15:44:45 -0000 1.48 --- admin_mx_module.php 9 Feb 2008 12:44:32 -0000 1.49 *************** *** 12,17 **** if( !empty($setmodules) ) { ! $file = basename(__FILE__); ! $module['2_CP']['2_1_Modules'] = 'admin/' . $file; return; } --- 12,16 ---- if( !empty($setmodules) ) { ! $module['2_CP']['2_1_Modules'] = 'admin/' . basename(__FILE__); return; } Index: index_new.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_new.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** index_new.php 8 Feb 2008 14:53:45 -0000 1.7 --- index_new.php 9 Feb 2008 12:44:32 -0000 1.8 *************** *** 91,99 **** if ( ( empty( $_SID ) || $_SID == 'sid=' ) ) { ! $_SID = 'sid=' . $HTTP_GET_VARS['sid']; } if ( ( empty( $SID ) || $SID == 'sid=' ) ) { ! $SID = 'sid=' . $HTTP_GET_VARS['sid']; } --- 91,99 ---- if ( ( empty( $_SID ) || $_SID == 'sid=' ) ) { ! $_SID = 'sid='.$mx_request_vars->get('sid', MX_TYPE_NO_TAGS); } if ( ( empty( $SID ) || $SID == 'sid=' ) ) { ! $SID = 'sid='.$mx_request_vars->get('sid', MX_TYPE_NO_TAGS); } Index: admin_mx_words.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_words.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mx_words.php 13 Sep 2007 09:12:37 -0000 1.1 --- admin_mx_words.php 9 Feb 2008 12:44:32 -0000 1.2 *************** *** 49,56 **** } ! if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) { ! $mode = (isset($HTTP_GET_VARS['mode'])) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode']; ! $mode = htmlspecialchars($mode); } else --- 49,55 ---- } ! if ($mx_request_vars->is_request('mode')) { ! $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS); } else *************** *** 59,73 **** // These could be entered via a form button // ! if( isset($HTTP_POST_VARS['add']) ) { ! $mode = "add"; } ! else if( isset($HTTP_POST_VARS['save']) ) { ! $mode = "save"; } else { ! $mode = ""; } } --- 58,72 ---- // These could be entered via a form button // ! if ($mx_request_vars->is_post('add')) { ! $mode = 'add'; } ! else if ($mx_request_vars->is_post('save')) { ! $mode = 'save'; } else { ! $mode = ''; } } *************** *** 80,84 **** if( $mode == "edit" || $mode == "add" ) { ! $word_id = ( isset($HTTP_GET_VARS['id']) ) ? intval($HTTP_GET_VARS['id']) : 0; $template->set_filenames(array( --- 79,83 ---- if( $mode == "edit" || $mode == "add" ) { ! $word_id = $mx_request_vars->get('id', MX_TYPE_INT, 0); $template->set_filenames(array( *************** *** 131,137 **** else if( $mode == "save" ) { ! $word_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : 0; ! $word = ( isset($HTTP_POST_VARS['word']) ) ? trim($HTTP_POST_VARS['word']) : ""; ! $replacement = ( isset($HTTP_POST_VARS['replacement']) ) ? trim($HTTP_POST_VARS['replacement']) : ""; if($word == "" || $replacement == "") --- 130,136 ---- else if( $mode == "save" ) { ! $word_id = $mx_request_vars->post('id', MX_TYPE_INT, 0); ! $word = $mx_request_vars->post('word', MX_TYPE_NO_TAGS); ! $replacement = $mx_request_vars->post('replacement', MX_TYPE_NO_TAGS); if($word == "" || $replacement == "") *************** *** 165,172 **** else if( $mode == "delete" ) { ! if( isset($HTTP_POST_VARS['id']) || isset($HTTP_GET_VARS['id']) ) { ! $word_id = ( isset($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id']; ! $word_id = intval($word_id); } else --- 164,170 ---- else if( $mode == "delete" ) { ! if ($mx_request_vars->is_request('id')) { ! $word_id = $mx_request_vars->request('id', MX_TYPE_INT); } else *************** *** 175,179 **** } ! $confirm = isset($HTTP_POST_VARS['confirm']); if( $word_id && $confirm ) --- 173,177 ---- } ! $confirm = $mx_request_vars->is_post('confirm'); if( $word_id && $confirm ) Index: admin_mx_styles.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_styles.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_styles.php 13 Sep 2007 09:12:37 -0000 1.2 --- admin_mx_styles.php 9 Feb 2008 12:44:32 -0000 1.3 *************** *** 23,32 **** if( !empty($setmodules) ) { ! $file = basename(__FILE__); ! $module['3_CP']['2_1_new'] = 'admin/' . "$file?mode=addnew"; ! //$module['Styles']['Create_new'] = 'admin/' . "$file?mode=create"; ! $module['3_CP']['2_2_manage'] = 'admin/' . $file; ! //$module['Styles']['Export'] = 'admin/' . "$file?mode=export"; ! //$module['2_CP']['2_1_Modules'] = 'admin/' . $file; return; } --- 23,32 ---- if( !empty($setmodules) ) { ! $filename = basename(__FILE__); ! $module['3_CP']['2_1_new'] = 'admin/' . "$filename?mode=addnew"; ! //$module['Styles']['Create_new'] = 'admin/' . "$filename?mode=create"; ! $module['3_CP']['2_2_manage'] = 'admin/' . $filename; ! //$module['Styles']['Export'] = 'admin/' . "$filename?mode=export"; ! //$module['2_CP']['2_1_Modules'] = 'admin/' . $filename; return; } *************** *** 46,51 **** include_once('./page_header_admin.php'); ! $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE; ! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE; if ($cancel) --- 46,51 ---- include_once('./page_header_admin.php'); ! $confirm = $mx_request_vars->is_post('confirm'); ! $cancel = $mx_request_vars->is_post('cancel'); if ($cancel) *************** *** 54,65 **** } ! if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) { ! $mode = ( isset($HTTP_GET_VARS['mode']) ) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode']; ! $mode = htmlspecialchars($mode); } else { ! $mode = ""; } --- 54,64 ---- } ! if ($mx_request_vars->is_request('mode')) { ! $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS); } else { ! $mode = ''; } *************** *** 67,72 **** { case "addnew": ! $install_to = ( isset($HTTP_GET_VARS['install_to']) ) ? urldecode($HTTP_GET_VARS['install_to']) : $HTTP_POST_VARS['install_to']; ! $style_name = ( isset($HTTP_GET_VARS['style']) ) ? urldecode($HTTP_GET_VARS['style']) : $HTTP_POST_VARS['style']; if( isset($install_to) ) --- 66,71 ---- { case "addnew": ! $install_to = $mx_request_vars->is_get('install_to') ? urldecode($mx_request_vars->get('install_to', MX_TYPE_NO_TAGS)) : $mx_request_vars->post('install_to', MX_TYPE_NO_TAGS); ! $style_name = $mx_request_vars->is_get('style') ? urldecode($mx_request_vars->get('style', MX_TYPE_NO_TAGS)) : $mx_request_vars->post('style', MX_TYPE_NO_TAGS); if( isset($install_to) ) *************** *** 162,166 **** case "delete": ! $style_id = ( isset($HTTP_GET_VARS['style_id']) ) ? intval($HTTP_GET_VARS['style_id']) : intval($HTTP_POST_VARS['style_id']); if( !$confirm ) --- 161,165 ---- case "delete": ! $style_id = $mx_request_vars->request('style_id', MX_TYPE_INT); if( !$confirm ) *************** *** 263,267 **** } ! if (empty($HTTP_POST_VARS['send_file'])) { include('./page_footer_admin.php'); --- 262,266 ---- } ! if ($mx_request_vars->is_empty_post('send_file')) { include('./page_footer_admin.php'); Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** pagestart.php 4 Feb 2008 15:44:44 -0000 1.29 --- pagestart.php 9 Feb 2008 12:44:32 -0000 1.30 *************** *** 56,60 **** } ! if( $HTTP_GET_VARS['sid'] != $userdata['session_id'] ) { $url = str_replace(preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])), '', $HTTP_SERVER_VARS['REQUEST_URI']); --- 56,60 ---- } ! 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']); Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** admin_mx_portal.php 4 Feb 2008 15:44:45 -0000 1.38 --- admin_mx_portal.php 9 Feb 2008 12:44:32 -0000 1.39 *************** *** 29,33 **** $mode = ''; ! if( isset($HTTP_POST_VARS['submit']) ) { $mode = 'submit'; --- 29,33 ---- $mode = ''; ! if ($mx_request_vars->is_post('submit') ) { $mode = 'submit'; Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** admin_mx_block_cp.php 4 Feb 2008 15:44:45 -0000 1.18 --- admin_mx_block_cp.php 9 Feb 2008 12:44:32 -0000 1.19 *************** *** 67,74 **** // Parameters // ! $submit = ( isset($HTTP_POST_VARS['submit']) ) ? true : false; ! $submit_pars = ( isset($HTTP_POST_VARS['submit_pars']) ) ? true : false; ! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false; ! $preview = ( isset($HTTP_POST_VARS['preview']) ) ? true : false; $refresh = $preview || $submit_search; --- 67,74 ---- // Parameters // ! $submit = $mx_request_vars->is_post('submit'); ! $submit_pars = $mx_request_vars->is_post('submit_pars'); ! $cancel = $mx_request_vars->is_post('cancel'); ! $preview = $mx_request_vars->is_post('preview'); $refresh = $preview || $submit_search; |
|
From: MW <jo...@us...> - 2008-02-09 12:42:07
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25635/includes/shared/phpbb3/includes Modified Files: functions_hook.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: functions_hook.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** functions_hook.php 8 Feb 2008 14:59:32 -0000 1.8 --- functions_hook.php 9 Feb 2008 12:42:03 -0000 1.9 *************** *** 242,246 **** { global $phpEx, $mx_request_vars, $mx_root_path; ! $panel_i = $mx_request_vars->request( 'i', ''); $menu_action = $this->mx_master->menu_actions; array_shift( $menu_action); --- 242,246 ---- { global $phpEx, $mx_request_vars, $mx_root_path; ! $panel_i = $mx_request_vars->request( 'i', MX_TYPE_NO_TAGS); $menu_action = $this->mx_master->menu_actions; array_shift( $menu_action); |
|
From: MW <jo...@us...> - 2008-02-09 12:41:17
|
Update of /cvsroot/mxbb/core/includes/sessions/internal In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25492/includes/sessions/internal Modified Files: session.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/includes/sessions/internal/login.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** login.php 4 Feb 2008 15:56:43 -0000 1.3 --- login.php 9 Feb 2008 12:41:11 -0000 1.4 *************** *** 15,22 **** } ! if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && (!$userdata['session_logged_in'] || isset($HTTP_POST_VARS['admin'])) ) { ! $username = isset($HTTP_POST_VARS['username']) ? phpBB2::phpbb_clean_username($HTTP_POST_VARS['username']) : ''; ! $password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : ''; $sql = "SELECT user_id, username, user_password, user_active, user_level, user_login_tries, user_last_login_try --- 15,22 ---- } ! if ($mx_request_vars->is_request('login') && (!$userdata['session_logged_in'] || $mx_request_vars->is_post('admin')) ) { ! $username = $mx_request_vars->is_post('username') ? phpBB2::phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS)) : ''; ! $password = $mx_request_vars->post('password', MX_TYPE_NO_TAGS); $sql = "SELECT user_id, username, user_password, user_active, user_level, user_login_tries, user_last_login_try *************** *** 55,61 **** if( md5($password) == $row['user_password'] && $row['user_active'] ) { ! $autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0; ! $admin = (isset($HTTP_POST_VARS['admin'])) ? 1 : 0; $session_id = $mx_user->mx_session_create($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin); --- 55,61 ---- if( md5($password) == $row['user_password'] && $row['user_active'] ) { ! $autologin = $mx_request_vars->is_post('autologin'); ! $admin = $mx_request_vars->is_post('admin'); $session_id = $mx_user->mx_session_create($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin); *************** *** 66,70 **** { $fromurl = ( !empty($HTTP_REFERER) ) ? str_replace('&', '&', htmlspecialchars($HTTP_REFERER)) : "index.$phpEx"; ! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : $fromurl; mx_redirect(mx3_append_sid($url, false, false, $session_id)); } --- 66,71 ---- { $fromurl = ( !empty($HTTP_REFERER) ) ? str_replace('&', '&', htmlspecialchars($HTTP_REFERER)) : "index.$phpEx"; ! $url = $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS); ! $url = ( !empty($url) ) ? str_replace('&', '&', $url) : $fromurl; mx_redirect(mx3_append_sid($url, false, false, $session_id)); } *************** *** 87,93 **** } ! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : ''; ! $redirect = str_replace('?', '&', $redirect); ! if (strstr(urldecode($redirect), "\n") || strstr(urldecode($redirect), "\r")) { --- 88,97 ---- } ! $redirect = $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS); ! if (!empty($redirect)) ! { ! $redirect = str_replace('&', '&', $redirect); ! $redirect = str_replace('?', '&', $redirect); ! } if (strstr(urldecode($redirect), "\n") || strstr(urldecode($redirect), "\r")) { *************** *** 106,111 **** else { ! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : ""; ! $redirect = str_replace("?", "&", $redirect); if (strstr(urldecode($redirect), "\n") || strstr(urldecode($redirect), "\r")) --- 110,119 ---- else { ! $redirect = $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS); ! if (!empty($redirect)) ! { ! $redirect = str_replace('&', '&', $redirect); ! $redirect = str_replace('?', '&', $redirect); ! } if (strstr(urldecode($redirect), "\n") || strstr(urldecode($redirect), "\r")) *************** *** 122,126 **** } } ! else if( ( isset($HTTP_GET_VARS['logout']) || isset($HTTP_POST_VARS['logout']) ) && $userdata['session_logged_in'] ) { // session id check --- 130,134 ---- } } ! else if ($mx_request_vars->is_request('logout') && $userdata['session_logged_in'] ) { // session id check *************** *** 135,142 **** } ! if (!empty($HTTP_POST_VARS['redirect']) || !empty($HTTP_GET_VARS['redirect'])) { $fromurl = ( !empty($HTTP_REFERER) ) ? str_replace('&', '&', htmlspecialchars($HTTP_REFERER)) : "index.$phpEx"; ! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : $fromurl; mx_redirect(mx3_append_sid($url, false, false, $session_id)); } --- 143,150 ---- } ! if (!$mx_request_vars->is_empty_request('redirect')) { $fromurl = ( !empty($HTTP_REFERER) ) ? str_replace('&', '&', htmlspecialchars($HTTP_REFERER)) : "index.$phpEx"; ! $url = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : $fromurl; mx_redirect(mx3_append_sid($url, false, false, $session_id)); } *************** *** 148,152 **** else { ! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : "index.$phpEx"; mx_redirect(mx_append_sid($url, false)); } --- 156,160 ---- else { ! $url = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : "index.$phpEx"; mx_redirect(mx_append_sid($url, false)); } Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/session.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** session.php 5 Feb 2008 18:37:20 -0000 1.4 --- session.php 9 Feb 2008 12:41:11 -0000 1.5 *************** *** 53,57 **** { global $db, $board_config; ! global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID; $cookiename = $board_config['cookie_name']; --- 53,57 ---- { global $db, $board_config; ! global $HTTP_COOKIE_VARS, $mx_request_vars, $SID; $cookiename = $board_config['cookie_name']; *************** *** 69,73 **** { $sessiondata = array(); ! $session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : ''; $sessionmethod = SESSION_METHOD_GET; } --- 69,73 ---- { $sessiondata = array(); ! $session_id = $mx_request_vars->get('sid', mztnt); $sessionmethod = SESSION_METHOD_GET; } *************** *** 294,298 **** { global $db, $lang, $board_config; ! global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID; $cookiename = $board_config['cookie_name']; --- 294,298 ---- { global $db, $lang, $board_config; ! global $HTTP_COOKIE_VARS, $mx_request_vars, $SID; $cookiename = $board_config['cookie_name']; *************** *** 313,317 **** { $sessiondata = array(); ! $session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : ''; $sessionmethod = SESSION_METHOD_GET; } --- 313,317 ---- { $sessiondata = array(); ! $session_id = $mx_request_vars->get('sid',MX_TYPE_NO_TAGS); $sessionmethod = SESSION_METHOD_GET; } *************** *** 429,433 **** { global $db, $lang, $board_config, $userdata; ! global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID; $cookiename = $board_config['cookie_name']; --- 429,433 ---- { global $db, $lang, $board_config, $userdata; ! global $HTTP_COOKIE_VARS, $SID; $cookiename = $board_config['cookie_name']; |
|
From: MW <jo...@us...> - 2008-02-09 12:41:17
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25492/includes/sessions/phpbb3 Modified Files: 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/includes/sessions/phpbb3/login.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** login.php 4 Feb 2008 15:56:44 -0000 1.4 --- login.php 9 Feb 2008 12:41:11 -0000 1.5 *************** *** 15,22 **** } ! if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && ($userdata['user_id'] == ANONYMOUS || isset($HTTP_POST_VARS['admin'])) ) { ! $username = isset($HTTP_POST_VARS['username']) ? phpBB2::phpbb_clean_username($HTTP_POST_VARS['username']) : ''; ! $password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : ''; $sql = "SELECT * --- 15,22 ---- } ! if($mx_request_vars->is_request('login') && ($userdata['user_id'] == ANONYMOUS || $mx_request_vars->is_post('admin')) ) { ! $username = $mx_request_vars->is_post('username') ? phpBB2::phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS)) : ''; ! $password = $mx_request_vars->post('password', MX_TYPE_NO_TAGS); $sql = "SELECT * *************** *** 127,132 **** if (md5($password_old_format) == $row['user_password'] || md5($password) == $row['user_password'] || phpBB3::phpbb_check_hash($password, $row['user_password'])) { ! $autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0; ! $admin = (isset($HTTP_POST_VARS['admin'])) ? 1 : 0; $mx_user->session_create($row['user_id'], $admin, $autologin, $viewonline = true); $session_id = $mx_user->session_id; --- 127,132 ---- if (md5($password_old_format) == $row['user_password'] || md5($password) == $row['user_password'] || phpBB3::phpbb_check_hash($password, $row['user_password'])) { ! $autologin = $mx_request_vars->is_post('autologin'); ! $admin = $mx_request_vars->is_post('admin'); $mx_user->session_create($row['user_id'], $admin, $autologin, $viewonline = true); $session_id = $mx_user->session_id; *************** *** 140,144 **** { $fromurl = ( !empty($HTTP_REFERER) ) ? str_replace('&', '&', htmlspecialchars($HTTP_REFERER)) : "index.$phpEx"; ! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : $fromurl; mx_redirect(mx3_append_sid($url, false, false, $session_id)); } --- 140,144 ---- { $fromurl = ( !empty($HTTP_REFERER) ) ? str_replace('&', '&', htmlspecialchars($HTTP_REFERER)) : "index.$phpEx"; ! $url = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : $fromurl; mx_redirect(mx3_append_sid($url, false, false, $session_id)); } *************** *** 157,161 **** $db->sql_query($sql); ! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : ''; $redirect = str_replace('?', '&', $redirect); --- 157,161 ---- $db->sql_query($sql); ! $redirect = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : ''; $redirect = str_replace('?', '&', $redirect); *************** *** 195,199 **** if( $session_id ) { ! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : "index.$phpEx"; mx_redirect(mx3_append_sid($url, false)); } --- 195,199 ---- if( $session_id ) { ! $url = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : "index.$phpEx"; mx_redirect(mx3_append_sid($url, false)); } *************** *** 208,212 **** else { ! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : ""; $redirect = str_replace("?", "&", $redirect); --- 208,212 ---- else { ! $redirect = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : ''; $redirect = str_replace("?", "&", $redirect); *************** *** 224,228 **** } } ! else if( ( isset($HTTP_GET_VARS['logout']) || isset($HTTP_POST_VARS['logout']) ) && $userdata['session_logged_in'] ) { // session id check --- 224,228 ---- } } ! else if ($mx_request_vars->is_request('logout') && $userdata['session_logged_in'] ) { // session id check *************** *** 237,243 **** } ! if (!empty($HTTP_POST_VARS['redirect']) || !empty($HTTP_GET_VARS['redirect'])) { ! $url = (!empty($HTTP_POST_VARS['redirect'])) ? htmlspecialchars($HTTP_POST_VARS['redirect']) : htmlspecialchars($HTTP_GET_VARS['redirect']); $url = str_replace('&', '&', $url); mx_redirect(mx3_append_sid($url, false)); --- 237,243 ---- } ! if (!$mx_request_vars->is_empty_request('redirect')) { ! $url = $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS); $url = str_replace('&', '&', $url); mx_redirect(mx3_append_sid($url, false)); *************** *** 250,254 **** else { ! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : "index.$phpEx"; mx_redirect(mx3_append_sid($url, false)); } --- 250,254 ---- else { ! $url = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : "index.$phpEx"; mx_redirect(mx3_append_sid($url, false)); } |
|
From: MW <jo...@us...> - 2008-02-09 12:41:16
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25492/includes/sessions/phpbb2 Modified Files: session.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/includes/sessions/phpbb2/login.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** login.php 4 Feb 2008 15:56:44 -0000 1.3 --- login.php 9 Feb 2008 12:41:11 -0000 1.4 *************** *** 15,22 **** } ! if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && (!$userdata['session_logged_in'] || isset($HTTP_POST_VARS['admin'])) ) { ! $username = isset($HTTP_POST_VARS['username']) ? phpBB2::phpbb_clean_username($HTTP_POST_VARS['username']) : ''; ! $password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : ''; $sql = "SELECT user_id, username, user_password, user_active, user_level, user_login_tries, user_last_login_try --- 15,22 ---- } ! if($mx_request_vars->is_request('login') && (!$userdata['session_logged_in'] || $mx_request_vars->is_post('admin')) ) { ! $username = $mx_request_vars->is_post('username') ? phpBB2::phpbb_clean_username($mx_request_vars->post('username')) : ''; ! $password = $mx_request_vars->post('password', MX_TYPE_NO_TAGS); $sql = "SELECT user_id, username, user_password, user_active, user_level, user_login_tries, user_last_login_try *************** *** 55,61 **** if( md5($password) == $row['user_password'] && $row['user_active'] ) { ! $autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0; ! $admin = (isset($HTTP_POST_VARS['admin'])) ? 1 : 0; $session_id = $mx_user->mx_session_create($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin); --- 55,61 ---- if( md5($password) == $row['user_password'] && $row['user_active'] ) { ! $autologin = $mx_request_vars->is_post('autologin'); ! $admin = $mx_request_vars->is_post('admin'); $session_id = $mx_user->mx_session_create($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin); *************** *** 66,70 **** { $fromurl = ( !empty($HTTP_REFERER) ) ? str_replace('&', '&', htmlspecialchars($HTTP_REFERER)) : "index.$phpEx"; ! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : $fromurl; mx_redirect(mx3_append_sid($url, false, false, $session_id)); } --- 66,70 ---- { $fromurl = ( !empty($HTTP_REFERER) ) ? str_replace('&', '&', htmlspecialchars($HTTP_REFERER)) : "index.$phpEx"; ! $url = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : $fromurl; mx_redirect(mx3_append_sid($url, false, false, $session_id)); } *************** *** 87,91 **** } ! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : ''; $redirect = str_replace('?', '&', $redirect); --- 87,91 ---- } ! $redirect = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : ''; $redirect = str_replace('?', '&', $redirect); *************** *** 106,110 **** else { ! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : ""; $redirect = str_replace("?", "&", $redirect); --- 106,110 ---- else { ! $redirect = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : ""; $redirect = str_replace("?", "&", $redirect); *************** *** 122,126 **** } } ! else if( ( isset($HTTP_GET_VARS['logout']) || isset($HTTP_POST_VARS['logout']) ) && $userdata['session_logged_in'] ) { // session id check --- 122,126 ---- } } ! else if ($mx_request_vars->is_request('logout') && $userdata['session_logged_in'] ) { // session id check *************** *** 135,142 **** } ! if (!empty($HTTP_POST_VARS['redirect']) || !empty($HTTP_GET_VARS['redirect'])) { $fromurl = ( !empty($HTTP_REFERER) ) ? str_replace('&', '&', htmlspecialchars($HTTP_REFERER)) : "index.$phpEx"; ! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : $fromurl; mx_redirect(mx3_append_sid($url, false, false, $session_id)); } --- 135,142 ---- } ! if (!$mx_request_vars->is_empty_request('redirect')) { $fromurl = ( !empty($HTTP_REFERER) ) ? str_replace('&', '&', htmlspecialchars($HTTP_REFERER)) : "index.$phpEx"; ! $url = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : $fromurl; mx_redirect(mx3_append_sid($url, false, false, $session_id)); } *************** *** 148,152 **** else { ! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : "index.$phpEx"; mx_redirect(mx_append_sid($url, false)); } --- 148,152 ---- else { ! $url = !$mx_request_vars->is_empty_post('redirect') ? str_replace('&', '&', $mx_request_vars->post('redirect', MX_TYPE_NO_TAGS)) : "index.$phpEx"; mx_redirect(mx_append_sid($url, false)); } Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/session.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** session.php 5 Feb 2008 18:37:20 -0000 1.2 --- session.php 9 Feb 2008 12:41:11 -0000 1.3 *************** *** 53,57 **** { global $db, $board_config; ! global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID; $cookiename = $board_config['cookie_name']; --- 53,57 ---- { global $db, $board_config; ! global $HTTP_COOKIE_VARS, $mx_request_vars, $SID; $cookiename = $board_config['cookie_name']; *************** *** 69,73 **** { $sessiondata = array(); ! $session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : ''; $sessionmethod = SESSION_METHOD_GET; } --- 69,73 ---- { $sessiondata = array(); ! $session_id = $mx_request_vars->is_get('sid',MX_TYPE_NO_TAGS); $sessionmethod = SESSION_METHOD_GET; } *************** *** 292,296 **** { global $db, $lang, $board_config; ! global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID; $cookiename = $board_config['cookie_name']; --- 292,296 ---- { global $db, $lang, $board_config; ! global $HTTP_COOKIE_VARS, $mx_request_vars, $SID; $cookiename = $board_config['cookie_name']; *************** *** 311,315 **** { $sessiondata = array(); ! $session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : ''; $sessionmethod = SESSION_METHOD_GET; } --- 311,315 ---- { $sessiondata = array(); ! $session_id = $mx_request_vars->is_get('sid', MX_TYPE_NO_TAGS); $sessionmethod = SESSION_METHOD_GET; } *************** *** 427,431 **** { global $db, $lang, $board_config, $userdata; ! global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID; $cookiename = $board_config['cookie_name']; --- 427,431 ---- { global $db, $lang, $board_config, $userdata; ! global $HTTP_COOKIE_VARS, $SID; $cookiename = $board_config['cookie_name']; |
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23865/includes Modified Files: mx_functions_blockcp.php mx_functions_admincp.php mx_functions.php page_header.php template.php Log Message: part of project wide change of using request_vars wrapper class instead of explicite and unfiltered $HTML_*_VARS Index: template.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/template.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** template.php 7 Feb 2008 16:16:59 -0000 1.24 --- template.php 9 Feb 2008 12:37:24 -0000 1.25 *************** *** 474,478 **** function subtemplates_make_filename($filename) { ! global $HTTP_GET_VARS, $HTTP_POST_VARS, $db, $board_config, $images, $theme; global $sub_template_key_image, $sub_templates; global $tree; --- 474,478 ---- function subtemplates_make_filename($filename) { ! global $mx_request_vars, $db, $board_config, $images, $theme; global $sub_template_key_image, $sub_templates; global $tree; *************** *** 499,525 **** $post_id = 0; ! if ( !defined('IN_PRIVMSG') && ( isset($HTTP_GET_VARS[POST_POST_URL]) || isset($HTTP_POST_VARS[POST_POST_URL]) ) ) { ! $post_id = isset($HTTP_GET_VARS[POST_POST_URL]) ? intval($HTTP_GET_VARS[POST_POST_URL]) : intval($HTTP_POST_VARS[POST_POST_URL]); } ! if ( isset($HTTP_GET_VARS[POST_TOPIC_URL]) || isset($HTTP_POST_VARS[POST_TOPIC_URL]) ) { ! $topic_id = intval($HTTP_GET_VARS[POST_TOPIC_URL]) ? intval($HTTP_GET_VARS[POST_TOPIC_URL]) : intval($HTTP_POST_VARS[POST_TOPIC_URL]); } ! if ( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]) ) { ! $forum_id = isset($HTTP_GET_VARS[POST_FORUM_URL]) ? intval($HTTP_GET_VARS[POST_FORUM_URL]) : intval($HTTP_POST_VARS[POST_FORUM_URL]); } ! if ( isset($HTTP_GET_VARS[POST_CAT_URL]) || isset($HTTP_POST_VARS[POST_CAT_URL]) ) { ! $cat_id = isset($HTTP_GET_VARS[POST_CAT_URL]) ? intval($HTTP_GET_VARS[POST_CAT_URL]) : intval($HTTP_POST_VARS[POST_CAT_URL]); } ! if ( isset($HTTP_GET_VARS['selected_id']) || isset($HTTP_POST_VARS['selected_id']) ) { ! $selected_id = isset($HTTP_GET_VARS['selected_id']) ? $HTTP_GET_VARS['selected_id'] : $HTTP_POST_VARS['selected_id']; $type = substr($selected_id, 0, 1); $id = intval(substr($selected_id, 1)); --- 499,525 ---- $post_id = 0; ! if ( !defined('IN_PRIVMSG') && $mx_request_vars->is_request(POST_POST_URL)) { ! $post_id = $mx_request_vars->request(POST_POST_URL, MX_TYPE_INT); } ! if ($mx_request_vars->is_request(POST_TOPIC_URL) ) { ! $topic_id = $mx_request_vars->request(POST_TOPIC_URL, MX_TYPE_INT); } ! if ($mx_request_vars->is_request(POST_FORUM_URL)) { ! $forum_id = $mx_request_vars->request(POST_FORUM_URL, MX_TYPE_INT); } ! if ($mx_request_vars->is_request(POST_CAT_URL)) { ! $cat_id = $mx_request_vars->request(POST_CAT_URL, MX_TYPE_INT); } ! if ($mx_request_vars->is_request('selected_id')) { ! $selected_id = $mx_request_vars->request('selected_id', MX_TYPE_NO_TAGS); $type = substr($selected_id, 0, 1); $id = intval(substr($selected_id, 1)); *************** *** 1551,1555 **** // remove keyword $keyword_str = substr($line, $pos1, $pos2 - $pos1 + 4); ! $params_str = $pos2 == $pos3 ? '' : trim(substr($line, $pos3 + 1, $pos2 - $pos3 - 1)); $code_lines[$i] = substr($line, $pos2 + 4); $i--; --- 1551,1555 ---- // remove keyword $keyword_str = substr($line, $pos1, $pos2 - $pos1 + 4); ! $params_str = ($pos2 == $pos3) ? '' : substr($line, $pos3 + 1, $pos2 - $pos3 - 1); $code_lines[$i] = substr($line, $pos2 + 4); $i--; Index: mx_functions_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mx_functions_blockcp.php 8 Feb 2008 23:35:57 -0000 1.23 --- mx_functions_blockcp.php 9 Feb 2008 12:37:24 -0000 1.24 *************** *** 62,66 **** function _controlpanel( $id, $new_block = false ) { ! global $blockcptemplate, $lang, $db, $board_config, $theme, $HTTP_GET_VARS, $HTTP_POST_VARS, $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, $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; *************** *** 112,120 **** $buttonvalue = $lang['Update']; ! $block_title = ( isset($HTTP_POST_VARS[$block_keys['block_title']]) ) ? stripslashes(htmlspecialchars($HTTP_POST_VARS[$block_keys['block_title']])) : $this->$block_keys['block_title']; ! $block_desc = ( isset($HTTP_POST_VARS[$block_keys['block_desc']]) ) ? stripslashes(htmlspecialchars($HTTP_POST_VARS[$block_keys['block_desc']])) : $this->$block_keys['block_desc']; ! $show_block = ( isset($HTTP_POST_VARS[$block_keys['show_block']]) ) ? intval($HTTP_POST_VARS[$block_keys['show_block']]) : intval($this->$block_keys['show_block']); ! $show_title = ( isset($HTTP_POST_VARS[$block_keys['show_title']]) ) ? intval($HTTP_POST_VARS[$block_keys['show_title']]) : intval($this->$block_keys['show_title']); ! $show_stats = ( isset($HTTP_POST_VARS[$block_keys['show_stats']]) ) ? intval($HTTP_POST_VARS[$block_keys['show_stats']]) : intval($this->$block_keys['show_stats']); // --- 112,120 ---- $buttonvalue = $lang['Update']; ! $block_title = $mx_request_vars->post($block_keys['block_title'], MX_TYPE_NO_TAGS, $this->$block_keys['block_title']); ! $block_desc = $mx_request_vars->post($block_keys['block_desc'], MX_TYPE_NO_TAGS, $this->$block_keys['block_desc']); ! $show_block = $mx_request_vars->post($block_keys['show_block'], MX_TYPE_INT, $this->$block_keys['show_block']); ! $show_title = $mx_request_vars->post($block_keys['show_title'],MX_TYPE_INT, $this->$block_keys['show_title']); ! $show_stats = $mx_request_vars->post($block_keys['show_stats'], MX_TYPE_INT, $this->$block_keys['show_stats']); // Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** page_header.php 4 Feb 2008 15:56:43 -0000 1.50 --- page_header.php 9 Feb 2008 12:37:24 -0000 1.51 *************** *** 575,579 **** // Do NOT set basedir when in EDIT mode // ! if ( !(isset($HTTP_POST_VARS['portalpage']) || isset($HTTP_GET_VARS['portalpage'])) ) { $layouttemplate->assign_block_vars('switch_set_base', array()); --- 575,579 ---- // Do NOT set basedir when in EDIT mode // ! if ( !$mx_request_vars->is_request('portalpage')) { $layouttemplate->assign_block_vars('switch_set_base', array()); Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** mx_functions_admincp.php 8 Feb 2008 23:35:57 -0000 1.47 --- mx_functions_admincp.php 9 Feb 2008 12:37:24 -0000 1.48 *************** *** 97,101 **** function _do_insert($type, $id ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $userdata, $mx_request_vars, $mx_cache; switch ( $type ) --- 97,101 ---- function _do_insert($type, $id ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $userdata, $mx_request_vars, $mx_cache; switch ( $type ) *************** *** 105,109 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['module_name'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 105,109 ---- if ( !MX_ADMIN_DEBUG ) { ! if ( $mx_request_vars->is_empty_post('module_name')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 144,148 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['function_name'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 144,148 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('function_name')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 174,178 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['parameter_name'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 174,178 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('parameter_name')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 251,255 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['block_title'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 251,255 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('block_title')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 325,329 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['page_name'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 325,329 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('page_name')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 435,439 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['column_title'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 435,439 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('column_title')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 478,482 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['block_id'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 478,482 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('block_id')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 537,541 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['template_name'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 537,541 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('template_name')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 560,564 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['column_title'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 560,564 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('column_title') ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 590,594 **** } ! $message = $lang['AdminCP_action'] . ": " . $lang['Page_template_column'] . ' (' . htmlspecialchars(trim($HTTP_POST_VARS['column_title'])) . ') ' . $lang['was_inserted']; break; --- 590,594 ---- } ! $message = $lang['AdminCP_action'] . ": " . $lang['Page_template_column'] . ' (' . $mx_request_vars->post('column_title',MX_TYPE_NO_TAGS) . ') ' . $lang['was_inserted']; break; *************** *** 613,617 **** function _do_update($type, $id ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $userdata, $mx_request_vars, $mx_cache; switch ( $type ) --- 613,617 ---- function _do_update($type, $id ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $userdata, $mx_request_vars, $mx_cache; switch ( $type ) *************** *** 621,625 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['module_name'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 621,625 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('module_name')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 651,655 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['function_name'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 651,655 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('function_name')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 681,685 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['parameter_name'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 681,685 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('parameter_name')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 775,779 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['block_title'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 775,779 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('block_title')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 920,924 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['page_name'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 920,924 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('page_name')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 988,992 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['column_title'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 988,992 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('column_title')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 1042,1046 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['template_name'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 1042,1046 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('template_name')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 1064,1068 **** if ( !MX_ADMIN_DEBUG ) { ! if ( empty( $HTTP_POST_VARS['column_title'] ) ) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); --- 1064,1068 ---- if ( !MX_ADMIN_DEBUG ) { ! if ($mx_request_vars->is_empty_post('column_title')) { mx_message_die( GENERAL_ERROR, $lang['error_no_field'] ); *************** *** 1104,1108 **** function _do_delete($type, $id, $parent, $recache ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $mx_request_vars, $mx_cache, $mx_root_path, $mx_table_prefix, $table_prefix, $userdata; switch ( $type ) --- 1104,1108 ---- function _do_delete($type, $id, $parent, $recache ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $mx_request_vars, $mx_cache, $mx_root_path, $mx_table_prefix, $table_prefix, $userdata; switch ( $type ) *************** *** 1521,1526 **** $block_id = intval($id); ! $column_id = ( isset($HTTP_POST_VARS['column_id']) ) ? intval($HTTP_POST_VARS['column_id']) : intval($HTTP_GET_VARS['column_id']); ! $block_order = ( isset($HTTP_POST_VARS['block_order']) ) ? intval($HTTP_POST_VARS['block_order']) : intval($HTTP_GET_VARS['block_order']); $sql_xtra_options = ''; --- 1521,1526 ---- $block_id = intval($id); ! $column_id = $mx_request_vars->request('column_id', MX_TYPE_INT); ! $block_order = $mx_request_vars->request('block_order', MX_TYPE_INT); $sql_xtra_options = ''; *************** *** 1649,1653 **** function _do_move($type) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $mx_request_vars, $mx_cache; switch ( $type ) --- 1649,1653 ---- function _do_move($type) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $mx_request_vars, $mx_cache; switch ( $type ) *************** *** 1784,1788 **** function _do_sync($type ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS; switch ( $type ) --- 1784,1788 ---- function _do_sync($type ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $mx_request_vars; switch ( $type ) *************** *** 1794,1799 **** // ???? ! $column_id = intval($HTTP_GET_VARS[column_id]); ! sync('block', intval($HTTP_GET_VARS[block_id])); $show_index = true; --- 1794,1799 ---- // ???? ! $column_id = $mx_request_vars->get('column_id', MX_TYPE_INT); ! sync('block', $mx_request_vars->get('block_id', MX_TYPE_INT)); $show_index = true; *************** *** 1820,1824 **** function _do_upgrade($type ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $mx_request_vars; switch ( $type ) --- 1820,1824 ---- function _do_upgrade($type ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $mx_request_vars; switch ( $type ) *************** *** 1862,1866 **** function _do_export($type ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $mx_request_vars; switch ( $type ) --- 1862,1866 ---- function _do_export($type ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $mx_request_vars; switch ( $type ) *************** *** 2022,2026 **** // ! global $table_prefix, $mx_table_prefix, $userdata, $phpEx, $template, $lang, $db, $board_config, $HTTP_POST_VARS; // --- 2022,2026 ---- // ! global $table_prefix, $mx_table_prefix, $userdata, $phpEx, $template, $lang, $db, $board_config; // *************** *** 2367,2371 **** function getSafeObjects($fcontents) { ! global $template, $lang, $db, $board_config, $theme, $HTTP_POST_VARS, $delimeter; $module_id_max = $this->getMaxId(MODULE_TABLE, 'module_id'); --- 2367,2371 ---- function getSafeObjects($fcontents) { ! global $template, $lang, $db, $board_config, $theme, $delimeter; $module_id_max = $this->getMaxId(MODULE_TABLE, 'module_id'); *************** *** 2561,2565 **** function import_pak($file_name) { ! global $table_prefix, $mx_table_prefix, $userdata, $phpEx, $template, $lang, $db, $board_config, $theme, $HTTP_POST_VARS, $delimeter, $mx_root_path; $fcontents = @file($mx_root_path . $file_name); --- 2561,2565 ---- function import_pak($file_name) { ! global $table_prefix, $mx_table_prefix, $userdata, $phpEx, $template, $lang, $db, $board_config, $theme, $delimeter, $mx_root_path; $fcontents = @file($mx_root_path . $file_name); *************** *** 2899,2903 **** function export_pack($module_id) { ! global $template, $lang, $db, $board_config, $theme, $HTTP_POST_VARS, $delimeter; $sql = "SELECT * FROM " . MODULE_TABLE . " WHERE module_id = $module_id"; --- 2899,2903 ---- function export_pack($module_id) { ! global $template, $lang, $db, $board_config, $theme, $delimeter; $sql = "SELECT * FROM " . MODULE_TABLE . " WHERE module_id = $module_id"; *************** *** 3782,3786 **** function mx_do_install_upgrade( $sql = '', $main_install = false ) { ! global $table_prefix, $mx_table_prefix, $userdata, $phpEx, $template, $lang, $db, $board_config, $HTTP_POST_VARS; $inst_error = false; --- 3782,3786 ---- function mx_do_install_upgrade( $sql = '', $main_install = false ) { ! global $table_prefix, $mx_table_prefix, $userdata, $phpEx, $template, $lang, $db, $board_config; $inst_error = false; Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** mx_functions.php 8 Feb 2008 23:35:56 -0000 1.77 --- mx_functions.php 9 Feb 2008 12:37:24 -0000 1.78 *************** *** 891,895 **** function compose_mx_copy() { ! global $table_prefix, $mx_table_prefix, $userdata, $phpEx, $template, $lang, $theme, $db, $board_config, $HTTP_POST_VARS, $mx_page; $mx_page->page_title = $lang['mx_about_title']; --- 891,895 ---- function compose_mx_copy() { ! global $table_prefix, $mx_table_prefix, $userdata, $phpEx, $template, $lang, $theme, $db, $board_config, $mx_page; $mx_page->page_title = $lang['mx_about_title']; |
|
From: MW <jo...@us...> - 2008-02-09 12:34:14
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22290/includes Modified Files: mx_functions_core.php Log Message: Extended request_vars wrapper class to also deal with the possibility of empty but maybe still set GET/POST vars. Also first set of changes of using wrapper class instead of $HTML_*_VARS Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** mx_functions_core.php 8 Feb 2008 23:35:57 -0000 1.67 --- mx_functions_core.php 9 Feb 2008 12:34:09 -0000 1.68 *************** *** 1987,1991 **** function submit_parameters( $block_id = false ) { ! global $HTTP_POST_VARS, $db, $mx_cache, $lang, $userdata; $return = false; --- 1987,1991 ---- function submit_parameters( $block_id = false ) { ! global $mx_request_vars, $db, $mx_cache, $lang, $userdata; $return = false; *************** *** 2000,2004 **** { $parameter_id = $parameter_data['parameter_id']; ! $parameter_value = isset($HTTP_POST_VARS[$parameter_id]) ? $HTTP_POST_VARS[$parameter_id] : $parameter_data['parameter_default']; $parameter_opt = ''; --- 2000,2004 ---- { $parameter_id = $parameter_data['parameter_id']; ! $parameter_value = $mx_request_vars->post($parameter_id, MX_TYPE_NO_TAGS, $parameter_data['parameter_default']); $parameter_opt = ''; *************** *** 2869,2873 **** function _set_all() { ! global $userdata, $mx_root_path, $HTTP_GET_VARS, $HTTP_COOKIE_VARS, $portal_config, $theme, $lang; global $mx_block; --- 2869,2873 ---- function _set_all() { ! global $userdata, $mx_root_path, $mx_request_vars, $HTTP_COOKIE_VARS, $portal_config, $theme, $lang; global $mx_block; *************** *** 2914,2920 **** $s_hidden_fields .= '<input type="hidden" name="portalpage" value="' . $this->page_id . '" />'; $s_hidden_fields .= '<input type="hidden" name="mode" value="setting" />'; ! $s_hidden_fields .= isset( $HTTP_GET_VARS['f'] ) ? '<input type="hidden" name="f" value="' . intval( $HTTP_GET_VARS['f'] ) . '" />' : ''; ! $s_hidden_fields .= isset( $HTTP_GET_VARS['t'] ) ? '<input type="hidden" name="t" value="' . intval( $HTTP_GET_VARS['t'] ) . '" />' : ''; ! $s_hidden_fields .= isset( $HTTP_GET_VARS['p'] ) ? '<input type="hidden" name="p" value="' . intval( $HTTP_GET_VARS['p'] ) . '" />' : ''; $this->s_hidden_fields = $s_hidden_fields; --- 2914,2920 ---- $s_hidden_fields .= '<input type="hidden" name="portalpage" value="' . $this->page_id . '" />'; $s_hidden_fields .= '<input type="hidden" name="mode" value="setting" />'; ! $s_hidden_fields .= $mx_request_vars->is_get('f') ? '<input type="hidden" name="f" value="' . $mx_request_vars->get('f', MX_TYPE_INT) . '" />' : ''; ! $s_hidden_fields .= $mx_request_vars->is_get('t') ? '<input type="hidden" name="t" value="' . $mx_request_vars->get('t', MX_TYPE_INT) . '" />' : ''; ! $s_hidden_fields .= $mx_request_vars->get('p') ? '<input type="hidden" name="p" value="' . $mx_request_vars->get('p', MX_TYPE_INT) . '" />' : ''; $this->s_hidden_fields = $s_hidden_fields; *************** *** 3781,3784 **** --- 3781,3840 ---- return ( $this->is_get($var) || $this->is_post($var) ); } + /** + * Is POST var empty? + * + * Boolean method to check if POST variable is empty + * as it might be set but still be empty. + * + * @access public + * @param string $var + * @return boolean + */ + 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; + } + /** + * Is GET var empty? + * + * Boolean method to check if GET variable is empty + * as it might be set but still be empty + * + * @access public + * @param string $var + * @return boolean + */ + 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; + } + + /** + * Is REQUEST empty (GET and POST) var? + * + * Boolean method to check if REQUEST (both) variable is empty. + * + * @access public + * @param string $var + * @return boolean + */ + function is_empty_request($var) + { + return ( $this->is_empty_get($var) && $this->is_empty_post($var) ); + } + } // class mx_request_vars |
|
From: OryNider <ory...@us...> - 2008-02-09 11:34:11
|
Update of /cvsroot/mxbb/mx_pjirc/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7887/admin Added Files: pjirc_config_body.tpl Log Message: upgrade --- NEW FILE: pjirc_config_body.tpl --- <center><h1>{L_PJIRC_SETTINGS}</h1> <p>{L_PJIRC_SETTINGS_EXPLAIN}<br /></p></center> <form enctype="multipart/form-data" action="{S_ACTION}" method=post> <table width="640" cellpadding="4" cellspacing="1" border="0" align="center" class="forumline"> <tr> <th class="thHead" colspan="2">{L_PJIRC_SETTINGS}</th> </tr> <tr> <td class="row1"><p><b>{L_CHAT}:</b><br></p></td> <td class="row2"><input type="text" maxlength="64" size="32" name="chat_name" value="{CHAT_NAME}" /></td> </tr> <tr> <td class="row1"><p><b>{L_PREFIX_USERNAME}:</b><br><span class="gensmall">{L_PREFIX_USERNAME_EXPLAIN}</span></p></td> <td class="row2"><input type="text" maxlength="16" size="16" name="prefix_username" value="{PREFIX_USERNAME}" /></td> </tr> <tr> <td class="row1"><p><b>{L_SERVER}:</b><br></p></td> <td class="row2"><input type="text" maxlength="64" size="32" name="irc_server" value="{IRC_SERVER}" /></td> </tr> <tr> <td class="row1"><p><b>{L_PORT}:</b><br></p></td> <td class="row2"><input type="text" maxlength="5" size="5" name="irc_port" value="{IRC_PORT}" /></td> </tr> <tr> <td class="row1"><p><b>{L_CHANNEL}:</b><br></p></td> <td class="row2"><input type="text" maxlength="32" size="16" name="irc_channel" value="{IRC_CHANNEL}" /></td> </tr> <tr> <td class="row1"><p><b>{L_CHECK_PERIOD}:</b><br><span class="gensmall">{L_CHECK_PERIOD_EXPLAIN}</span></p></td> <td class="row2"><input type="text" maxlength="16" size="16" name="check_period" value="{CHECK_PERIOD}" /></td> </tr> <tr> <td class="row1"><p><b>{L_QUIT_MESSAGE}:</b><br></p></td> <td class="row2"><textarea cols=64 name="irc_quit" row=3 />{IRC_QUIT}</textarea></td> </tr> <tr> <td class="row1">{L_ALLOW_GUESTS}</span></td> <td class="row2"><input type="radio" name="irc_allow_guests" value="1" {IRC_ALLOW_GUESTS_YES} /> {L_YES} <input type="radio" name="irc_allow_guests" value="0" {IRC_ALLOW_GUESTS_NO} /> {L_NO}</td> </tr> <tr> <td class="row1">{L_GUESTNAME}<br><span class="gensmall">{L_GUESTNAME_EXPLAIN}</span></td> <td class="row2"><input class="post" type="text" name="irc_guestname" value="{IRC_GUESTNAME}" size="12" maxlength="20" /></td> </tr> <tr> <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS} <input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> <input type="reset" value="{L_RESET}" class="liteoption" /> </td> </tr> </table> <br> <table width="640" cellpadding="4" cellspacing="1" border="0" align="center" class="forumline"> <tr> <th class="thHead" colspan="2">{L_BUTTON_SETTINGS}</th> </tr> <tr> <td class="row1">{L_SHOW_CHAT}<br><span class="gensmall">{L_SHOW_CHAT_INFO}</span></td> <td class="row2"> <select name="show_chat_select" class="forminput"> <option value="1"{S_CHAT_YES}>{L_YES}</option> <option value="0"{S_CHAT_NO}>{L_NO}</option> </select></td> </tr> <tr> <td class="row1"><p><b>{L_SHOW_STATUS}:</b><br></p></td> <td class="row2">{SHOW_STATUS}</td></td> </tr> <tr> <td class="row1"><p><b>{L_SHOW_DOCK}:</b><br></p></td> <td class="row2">{SHOW_DOCK}</td></td> </tr> <tr> <td class="row1"><p><b>{L_SHOW_CONNECT}:</b><br></p></td> <td class="row2">{SHOW_CONNECT}</td></td> </tr> <tr> <td class="row1"><p><b>{L_SHOW_CHANLIST}:</b><br></p></td> <td class="row2">{SHOW_CHANLIST}</td></td> </tr> </table> <br> <table width="640" cellpadding="4" cellspacing="1" border="0" align="center" class="forumline"> <tr> <th class="thHead" colspan="2">{L_PJIRC_COLORS}</th> </tr> <tr> <td class="row1"><p><b>{L_BUTTON_SURROUND}:</b><br></p></td> <td class="row2"><select name="button_surround">{BUTTON_SURROUND}</select></td> </tr> <tr> <td class="row1"><p><b>{L_3D_BUTTON_HIGHLIGHT}:</b></p></td> <td class="row2"><select name="3d_button_highlight">{3D_BUTTON_HIGHLIGHT}</select></td> </tr> <tr> <td class="row1"><p><b>{L_3D_BUTTON_SHADOW}:</b><br></p></td> <td class="row2"><select name="3d_button_shadow">{3D_BUTTON_SHADOW}</select></td> </tr> <tr> <td class="row1"><p><b>{L_SCROLLBAR_TOP-BOTTOM}:</b><br></p></td> <td class="row2"><select name="scrollbar_top-bottom">{SCROLLBAR_TOP-BOTTOM}</select></td> </tr> <tr> <td class="row1"><p><b>{L_SCROLLBAR_HIGHLIGHT}:</b><br></p></td> <td class="row2"><select name="scrollbar_highlight">{SCROLLBAR_HIGHLIGHT}</select></td> </tr> <tr> <td class="row1"><p><b>{L_BUTTON_BACKGROUND}:</b><br></p></td> <td class="row2"><select name="button_background">{BUTTON_BACKGROUND}</select></td> </tr> <tr> <td class="row1"><p><b>{L_UI_BACKGROUND}:</b><br></p></td> <td class="row2"><select name="ui_background">{UI_BACKGROUND}</select></td> </tr> <tr> <td class="row1"><p><b>{L_WINDOW_BUTTON_BACKGROUND}:</b><br></p></td> <td class="row2"><select name="window_button_background">{WINDOW_BUTTON_BACKGROUND}</select></td> </tr> <tr> <td class="row1"><p><b>{L_USER_STATE_BUTTON}:</b><br></p></td> <td class="row2"><select name="user_state_button">{USER_STATE_BUTTON}</select></td> </tr> <tr> <td class="row1"><p><b>{L_MDI_BUTTONS_BACKGROUND}:</b><br></p></td> <td class="row2"><select name="mdi_buttons_background">{MDI_BUTTONS_BACKGROUND}</select></td> </tr> <tr> <td class="row1"><p><b>{L_ALERT_UPDATE_CHANNEL}:</b><br></p></td> <td class="row2"><select name="alert_update_channel">{ALERT_UPDATE_CHANNEL}</select></td> </tr> <tr> <td class="row1"><p><b>{L_USER_BUTTONS}:</b><br></p></td> <td class="row2"><select name="user_buttons"/>{USER_BUTTONS}</select></td> </tr> <tr> <td class="row1"><p><b>{L_BACKGROUND_IMAGE}:</b><br><span class="gensmall">{L_BACKGROUND_IMAGE_EXPLAIN}</span></p></td> <td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="200000" /><input type="file" name="background_image" class="post" />{BG_IMAGE_ON_OFF}</td></td> </tr> <tr> <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS} <input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> <input type="reset" value="{L_RESET}" class="liteoption" /> </td> </tr> </table> </form> <br clear="all" /> |
|
From: OryNider <ory...@us...> - 2008-02-09 11:34:11
|
Update of /cvsroot/mxbb/mx_pjirc/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7887 Added Files: pjirc_chat.tpl pjirc_faq.tpl pjirc_front.tpl Log Message: upgrade --- NEW FILE: pjirc_chat.tpl --- <html> <head> <CENTER><u><h2><title>{CHAT_NAME}</title></h2></u></CENTER> <style type="text/css"> <!-- td.taburlo{ margin:5px; padding:5px; border: 0; } .tdblock { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold; border: 0; margin: 2px; } --> </style> </head> <body BGCOLOR={UI_BACKGROUND}> <table width="100%" align="center" border="0" cellspacing="0" cellpadding="0" class="forumline"> <tr> <td class="row1" width="100%"><img src="images/spacer.gif" height="10"></td> </tr> <tr> <td align="center" class="row1" width="100%"> <applet codebase="{MODULE_PATH}pjirc" name="pjirc" code="IRCApplet.class" archive="irc.jar,pixx.jar,config.jar,javabot.jar" width=780 height=400> <param name="CABINETS" value="irc.cab,securedirc.cab,pixx.cab,config.cab,javabot.cab" /> <param name="plugin1" value="config.Config" /> <param name="nick" value="{USERNAME}" /> <param name="alternatenick" value="{PREFIX_USERNAME}{USERNAME}" /> <param name="name" value="{USERNAME}" /> <param name="host" value="{SERVER}" /> <param name="port" value="{PORT}" /> <param name="smileys" value="true"> <param name="gui" value="pixx" /> <param name="command1" value="/join {CHANNEL}" /> <param name="pixx:language" value="pixx-{LANG}" /> <param name="config:language" value="config-{LANG}" /> <param name="config:lngextension" value="lng" /> <param name="pixx:helppage" value="{HELP}" /> <param name="language" value="{LANG}" /> <param name="quitmessage" value="{QUIT_MESSAGE}" /> <param name="asl" value="true" /> <param name="useinfo" value="false" /> <param name="style:bitmapsmileys" value="true" /> <param name="style:smiley1" value=":)) img/laf.gif" /> <param name="style:smiley2" value=":) img/smile.gif" /> <param name="style:smiley3" value=":-) img/smile.gif" /> <param name="style:smiley4" value=":D img/biggrin.gif" /> <param name="style:smiley5" value=":-D img/haha.gif" /> <param name="style:smiley6" value=":-O img/OH-2.gif" /> <param name="style:smiley7" value=":o img/OH-1.gif" /> <param name="style:smiley8" value=":-P img/prrr.gif" /> <param name="style:smiley9" value=":P img/razz.gif" /> <param name="style:smiley10" value=";-) img/occ.gif" /> <param name="style:smiley11" value=";) img/wink.gif" /> <param name="style:smiley12" value=":-( img/triste.gif" /> <param name="style:smiley13" value=":(( img/cry.gif" /> <param name="style:smiley14" value=":( img/triste.gif" /> <param name="style:smiley15" value=":-| img/neutral.gif" /> <param name="style:smiley16" value=":| img/neutral.gif" /> <param name="style:smiley17" value=":'( img/frigna.gif" /> <param name="style:smiley18" value=":ghgh: img/ghgh.gif" /> <param name="style:smiley19" value=":gh: img/ghgh.gif" /> <param name="style:smiley20" value="(H) img/dito.gif" /> <param name="style:smiley21" value="(h) img/dito.gif" /> <param name="style:smiley22" value=":-@ img/inca.gif" /> <param name="style:smiley23" value=":@ img/inca.gif" /> <param name="style:smiley24" value=":dito: img/dito.gif" /> <param name="style:smiley25" value=":clap: img/clap.gif" /> <param name="style:smiley26" value=":ciao: img/ciao.gif" /> <param name="style:smiley27" value=":argh: img/inca.gif" /> <param name="style:smiley28" value=":porc: img/porc.gif" /> <param name="style:smiley29" value=":maiale: img/porc.gif" /> <param name="style:smiley30" value=":lol: img/lol.gif" /> <param name="style:smiley31" value=":haha: img/haha.gif" /> <param name="style:smiley32" value=":lov: img/love.gif" /> <param name="style:smiley33" value=":amore: img/love.gif" /> <param name="style:smiley34" value=":love: img/love.gif" /> <param name="style:smiley35" value=":nono: img/nono.gif" /> <param name="style:smiley36" value=":no: img/nono.gif" /> <param name="style:smiley37" value=":ko: img/ko.gif" /> <param name="style:smiley38" value=":tvb: img/abbra.gif" /> <param name="style:smiley39" value=":ubria: img/ubria.gif" /> <param name="style:smiley40" value=":beer: img/ubria.gif" /> <param name="style:smiley41" value=":kiss: img/bacio.gif" /> <param name="style:smiley42" value=":bacio: img/bacio.gif" /> <param name="style:smiley43" value=":perdono: img/perdono.gif" /> <param name="style:smiley44" value=":ing: img/perdono.gif" /> <param name="style:smiley45" value=":abbra: img/abbra.gif" /> <param name="style:smiley46" value=":prrr: img/prrr.gif" /> <param name="style:smiley47" value=":fuma: img/fuma.gif" /> <param name="style:smiley48" value=":smoke: img/fuma.gif" /> <param name="style:smiley49" value=":frigna: img/frigna.gif" /> <param name="style:smiley50" value=":inca: img/inca.gif" /> <param name="style:smiley51" value=":piange: img/frigna.gif" /> <param name="style:smiley52" value=":amen: img/amen.gif" /> <param name="style:smiley53" value="X( img/enerve1.gif" /> <param name="style:smiley54" value="X-( img/enerve2.gif" /> <param name="style:smiley55" value=">:) img/diable.gif" /> <param name="soundbeep" value="snd/bell2.au" /> <param name="soundquery" value="snd/ding.au" /> <param name="style:backgroundimage" value="{BACKGROUND_IMAGE_ON}" /> <param name="style:backgroundimage1" value="all all 0 background.jpg" /> <param name="style:sourcefontrule1" value="all all Serif 12" /> <param name="style:floatingasl" value="true" /> <param name="pixx:timestamp" value="true" /> <param name="pixx:highlight" value="true" /> <param name="pixx:highlightnick" value="true" /> <param name="pixx:highlightcolor" value="DFE6EF" /> <param name="pixx:highlightwords" value="hi ciao salut sal saluti hello buongiorno buonanotte cazzo meo kim ..." /> <param name="pixx:nickfield" value="true" /> <param name="pixx:styleselector" value="true" /> <param name="pixx:setfontonstyle" value="true" /> <param name="pixx:showabout" value="true" /> <param name="pixx:showstatus" value="{SHOW_STATUS}" /> <param name="pixx:showdock" value="{SHOW_DOCK}" /> <param name="pixx:showconnect" value="{SHOW_CONNECT}" /> <param name="pixx:showchanlist" value="{SHOW_CHANLIST}" /> <param name="pixx:color0" value="{BUTTON_SURROUND}" /> <param name="pixx:color1" value="{3D_BUTTON_HIGHLIGHT}" /> <param name="pixx:color2" value="{3D_BUTTON_SHADOW}" /> <param name="pixx:color3" value="{SCROLLBAR_TOP/BOTTOM}" /> <param name="pixx:color4" value="{SCROLLBAR_HIGHLIGHT}" /> <param name="pixx:color5" value="{BUTTON_BACKGROUND}" /> <param name="pixx:color6" value="{UI_BACKGROUND}" /> <param name="pixx:color7" value="{WINDOW_BUTTON_BACKGROUND}" /> <param name="pixx:color8" value="FF0000" /> <param name="pixx:color9" value="{MDI_BUTTONS_BACKGROUND}" /> <param name="pixx:color10" value="{USER_STATE_BUTTON}" /> <param name="pixx:color11" value="FF0000" /> <param name="pixx:color12" value="{ALERT_UPDATE_CHANNEL}" /> <param name="pixx:color13" value="00FFFF" /> <param name="pixx:color14" value="FF0000" /> <param name="pixx:color15" value="{USER_BUTTONS}" /> <param name="fingerreply" value="Mx_PJIRC v1.0.0" /> <param name="pixx:nickprefix" value="«" /> <param name="pixx:nickpostfix" value="»\s" /> <param name="pixx:prefixops" value="true" /> <param name="pixx:prefixvops" value="true" /> <param name="pixx:prefixbold" value="true" /> <param name="pixx:prefixsopfg" value="4" /> <param name="pixx:prefixsopbg" value="0" /> <param name="pixx:prefixpopfg" value="4" /> <param name="pixx:prefixpopbg" value="0" /> <param name="pixx:prefixopfg" value="5" /> <param name="pixx:prefixopbg" value="8" /> <param name="pixx:prefixhopfg" value="6" /> <param name="pixx:prefixhopbg" value="3" /> <param name="pixx:prefixvopfg" value="3" /> <param name="pixx:prefixvopbg" value="2" /> <param name="javabot:alias1" value="P" /> <param name="javabot:alias2" value="N" /> <param name="javabot:alias3" value="j" /> <param name="javabot:alias4" value="hop" /> <param name="javabot:alias5" value="W" /> <param name="javabot:alias6" value="Q" /> <param name="javabot:aliascommand1_1" value="/part $-" /> <param name="javabot:aliascommand2_1" value="/nick $1" /> <param name="javabot:aliascommand3_1" value="/join #$1" /> <param name="javabot:aliascommand4_1" value="/part #$1" /> <param name="javabot:aliascommand4_2" value="/join #$1" /> <param name="javabot:aliascommand5_1" value="/whois $1" /> <param name="javabot:aliascommand6_1" value="/query $1" /> </applet> </td> </tr> <tr> <td valign="top" class="taburlo"> <table width="100%" border="0"> <tr> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/ciao.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':ciao:');document.pjirc.requestSourceFocus()" alt=":ciao:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/inca.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':inca:');document.pjirc.requestSourceFocus()" alt=":inca:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/wink.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+';)');document.pjirc.requestSourceFocus()" alt=";)" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/dito.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':dito:');document.pjirc.requestSourceFocus()" alt=":dito:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/clap.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':clap:');document.pjirc.requestSourceFocus()" alt=":clap:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/porc.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':porc:');document.pjirc.requestSourceFocus()" alt=":porc:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/nono.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':nono:');document.pjirc.requestSourceFocus()" alt=":nono:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/haha.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':haha:');document.pjirc.requestSourceFocus()" alt=":haha:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/love.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':love:');document.pjirc.requestSourceFocus()" alt=":love:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/ko.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':ko:');document.pjirc.requestSourceFocus()" alt=":ko:" /></a></div></td> </tr> <tr> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/smile.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':)');document.pjirc.requestSourceFocus()" alt=":)" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/triste.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':(');document.pjirc.requestSourceFocus()" alt=":(" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/abbra.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':abbra:');document.pjirc.requestSourceFocus()" alt=":abbra:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/ghgh.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':ghgh:');document.pjirc.requestSourceFocus()" alt=":ghgh:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/ubria.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':ubria:');document.pjirc.requestSourceFocus()" alt=":ubria:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/bacio.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':bacio:');document.pjirc.requestSourceFocus()" alt=":bacio:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/perdono.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':perdono:');document.pjirc.requestSourceFocus()" alt=":perdono:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/prrr.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':prrr:');document.pjirc.requestSourceFocus()" alt=":prrr:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/fuma.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':fuma:');document.pjirc.requestSourceFocus()" alt=":fuma:" /></a></div></td> <td class="tdblock"><div align="center"><a href="#{CHAT_NAME}"><img src="pjirc/img/frigna.gif" border="0" onclick="document.pjirc.setFieldText(document.pjirc.getFieldText()+':frigna:');document.pjirc.requestSourceFocus()" alt=":frigna:" /></a></div></td> </tr> </table> </td> <tr> <td class="row1" align="center" width="100%">{SERVER} :: {PORT} :: {CHANNEL}</td> </tr> <tr> <td class="row1"><img src="images/spacer.gif" height="10"></td> </tr> </table> --- NEW FILE: pjirc_faq.tpl --- <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td> </tr> </table> <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0" align="center"> <tr> <th class="thHead">{L_FAQ_TITLE}</th> </tr> <tr> <td class="row1"> <!-- BEGIN faq_block_link --> <span class="gen"><b>{faq_block_link.BLOCK_TITLE}</b></span><br /> <!-- BEGIN faq_row_link --> <span class="gen"><a href="{faq_block_link.faq_row_link.U_FAQ_LINK}" class="postlink">{faq_block_link.faq_row_link.FAQ_LINK}</a></span><br /> <!-- END faq_row_link --> <br /> <!-- END faq_block_link --> </td> </tr> <tr> <td class="catBottom" height="28"> </td> </tr> </table> <br clear="all" /> <!-- BEGIN faq_block --> <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0" align="center"> <tr> <td class="catHead" height="28" align="center"><span class="cattitle">{faq_block.BLOCK_TITLE}</span></td> </tr> <!-- BEGIN faq_row --> <tr> <td class="{faq_block.faq_row.ROW_CLASS}" align="left" valign="top"><span class="postbody"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b></span><br /><span class="postbody">{faq_block.faq_row.FAQ_ANSWER}<br /><a href="#top" onclick="window.scrollTo(0,0); return false">{L_BACK_TO_TOP}</a></span></td> </tr> <tr> <td class="spaceRow" height="1"><img src="{U_PHPBB_ROOT_PATH}templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td> </tr> <!-- END faq_row --> </table> <br clear="all" /> <!-- END faq_block --> <table width="100%" cellspacing="2" border="0" align="center"> <tr> <td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><br />{JUMPBOX}</td> </tr> </table> --- NEW FILE: pjirc_front.tpl --- <table width="{BLOCK_SIZE}" cellpadding="0" cellspacing="0" border="0" class="forumline"> <tr> <th class="thHead" align="center"> {L_TITLE} </th> </tr> <tr> <td> <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border:none; padding:4px;"> <tr> <!-- BEGIN switch_chatters_list_on --> <td class="row1" align="center" valign="middle" rowspan="3"> <!-- END switch_chatters_list_on --> <!-- BEGIN switch_chatters_list_off --> <td class="row1" align="center" valign="middle" rowspan="2"> <!-- END switch_chatters_list_off --> <img src="{CHAT_IMG}" alt="{L_VERSION}" border="0" /> </td> <!-- <td class="row1" align="left"> <span class="gensmall">{TOTAL_CHATTERS_ONLINE}</span> </td> --> </tr> <tr> <td class="row1" align="left"> <span class="gensmall"> <!-- BEGIN switch_user_logged_out_show_chat_yes --> [ <a href="javascript:void(0);" onClick="window.open('{S_JOIN_CHAT}','','scrollbars=no,resizable=no,width=800,height=540')">{L_CLICK_TO_JOIN_CHAT}</a> ] <!-- END switch_user_logged_out_show_chat_yes --> <!-- BEGIN switch_user_logged_out_show_chat_no --> [ {L_LOGIN_TO_JOIN_CHAT} ] <!-- END switch_user_logged_out_show_chat_no --> <!-- BEGIN switch_user_logged_in --> [ <a href="javascript:void(0);" onClick="window.open('{S_JOIN_CHAT}','','scrollbars=no,resizable=no,width=800,height=540')">{L_CLICK_TO_JOIN_CHAT}</a> ] <!-- END switch_user_logged_in --> <!-- BEGIN switch_user_chatting --> [ {L_ALREADY_CHATTING} ] <!-- END switch_user_chatting --> </span> </td> </tr> <!-- BEGIN switch_chatters_list_on --> <tr> <td class="row1" align="left"> <span class="gensmall">{CHATTERS_LIST}</span> </td> </tr> <!-- END switch_chatters_list_on --> </table> </td> </tr> </table> <br clear="all" /> |
|
From: OryNider <ory...@us...> - 2008-02-09 11:33:28
|
Update of /cvsroot/mxbb/mx_pjirc/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7824 Modified Files: lang_admin.php lang_faq.php lang_main.php Log Message: upgrade Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/language/lang_english/lang_main.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_main.php 8 Feb 2008 23:43:15 -0000 1.2 --- lang_main.php 9 Feb 2008 11:33:22 -0000 1.3 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 [Florin Bodin] mxBB Development Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 [Florin Bodin] mxBB Development Team *************** *** 24,26 **** // That's all Folks! // ------------------------------------------------- ! ?> \ No newline at end of file --- 24,26 ---- // That's all Folks! // ------------------------------------------------- ! ?> Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/language/lang_english/lang_admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_admin.php 10 Jul 2007 02:40:36 -0000 1.2 --- lang_admin.php 9 Feb 2008 11:33:21 -0000 1.3 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 [Florin Bodin] mxBB Development Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 [Florin Bodin] mxBB Development Team Index: lang_faq.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/language/lang_english/lang_faq.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_faq.php 8 Feb 2008 23:43:15 -0000 1.2 --- lang_faq.php 9 Feb 2008 11:33:21 -0000 1.3 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 [Florin Bodin] mxBB Development Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 [Florin Bodin] mxBB Development Team *************** *** 16,18 **** $faq[] = array("What are the smilies?", "The smilies are the same ones that are on the board."); ! ?> \ No newline at end of file --- 16,18 ---- $faq[] = array("What are the smilies?", "The smilies are the same ones that are on the board."); ! ?> |
Update of /cvsroot/mxbb/mx_pjirc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690 Modified Files: db_install.php db_uninstall.php db_upgrade.php index.php pjirc_chat.php pjirc_faq.php pjirc_front.php pjirc_update.php Log Message: upgrade Index: index.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.php 28 Jan 2008 21:59:55 -0000 1.2 --- index.php 9 Feb 2008 11:32:09 -0000 1.3 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006 amo, --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006 amo, *************** *** 9,35 **** */ ! define('IN_PORTAL', 1); ! //Turn On Error Reporting ! //error_reporting( E_ALL ); ! $mx_root_path = "../../"; ! $mx_module_path = "./"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.'.$phpEx); ! // ! //Start session management ! // ! $mx_user->init($user_ip, PAGE_INDEX); ! define('_PJIRC_CONFIG', true); ! include_once($mx_module_path .'includes/common.'.$phpEx); /* if ( !$userdata['session_logged_in'] ) { ! mx_redirect(append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/chat.".$phpEx, true)); exit; } --- 9,57 ---- */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) ! { ! define('IN_PORTAL', true); ! $mx_root_path = "../../"; ! $module_root_path = "./"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.'.$phpEx); ! // ! // Start session management ! // ! $mx_user->init($user_ip, PAGE_INDEX); ! // ! // End session management ! // ! $title = 'Media Player Radio'; ! $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '315' ); ! $is_block = FALSE; ! } ! else ! { ! // ! // Read block Configuration ! // ! ! $title = $mx_block->block_info['block_title']; ! $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); ! ! if( is_object($mx_block)) ! { ! $is_block = TRUE; ! } ! } ! ! define('_PJIRC_CONFIG', true); ! include_once($mx_module_path .'includes/common.'.$phpEx); /* if ( !$userdata['session_logged_in'] ) { ! redirect(mx_append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/chat.".$phpEx, true)); exit; } Index: pjirc_chat.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_chat.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pjirc_chat.php 8 Feb 2008 23:42:59 -0000 1.4 --- pjirc_chat.php 9 Feb 2008 11:32:09 -0000 1.5 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006 amo, --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006 amo, *************** *** 19,45 **** ******************************************/ ! define('IN_PORTAL', 1); ! //error_reporting( E_ALL ); ! //ini_set( 'display_errors', '1' ); ! $mx_root_path = "../../"; ! $mx_module_path = "./"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.'.$phpEx); ! // ! // Start session management ! // ! $mx_user->init($user_ip, PAGE_INDEX); ! define('_PJIRC_CONFIG', true); ! include_once($mx_module_path .'includes/common.'.$phpEx); /* if ( !$userdata['session_logged_in'] ) { ! mx_redirect(append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/pjirc_chat.".$phpEx, true)); exit; } --- 19,67 ---- ******************************************/ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) ! { ! define('IN_PORTAL', true); ! $mx_root_path = "../../"; ! $module_root_path = "./"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.'.$phpEx); ! // ! // Start session management ! // ! $mx_user->init($user_ip, PAGE_INDEX); ! // ! // End session management ! // ! $title = 'Media Player Radio'; ! $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '315' ); ! $is_block = FALSE; ! } ! else ! { ! // ! // Read block Configuration ! // ! ! $title = $mx_block->block_info['block_title']; ! $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); ! ! if( is_object($mx_block)) ! { ! $is_block = TRUE; ! } ! } ! ! define('_PJIRC_CONFIG', true); ! include_once($mx_module_path .'includes/common.'.$phpEx); /* if ( !$userdata['session_logged_in'] ) { ! mx_redirect(mx_append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/pjirc_chat.".$phpEx, true)); exit; } *************** *** 50,81 **** // ! // Checks if guests are allowed ! if( $pjirc_config['irc_allow_guests'] ) ! { ! if ( !$userdata['session_logged_in'] ) ! { ! $nick = str_replace(" ", "_", $pjirc_config['irc_guestname']); ! } ! else ! { ! $nick = str_replace(" ", "_", $userdata['username']); } ! } ! else ! { if ( !$userdata['session_logged_in'] ) { $nick = str_replace(" ", "_", $pjirc_config['irc_guestname']); ! mx_redirect(append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/pjirc_chat.".$phpEx, true)); exit; } ! else ! { ! $nick = str_replace(" ", "_", $userdata['username']); ! } } ! $help = append_sid(PORTAL_URL . "modules/mx_pjirc/pjirc_faq.".$phpEx); $page_title = $lang['Chat_Room']; --- 72,103 ---- // ! // Checks if guests are allowed ! if( $pjirc_config['irc_allow_guests'] ) ! { ! if ( !$userdata['session_logged_in'] ) ! { ! $nick = str_replace(" ", "_", $pjirc_config['irc_guestname']); } ! else ! { ! $nick = str_replace(" ", "_", $userdata['username']); ! } ! } ! else ! { if ( !$userdata['session_logged_in'] ) { $nick = str_replace(" ", "_", $pjirc_config['irc_guestname']); ! mx_redirect(mx_append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/pjirc_chat.".$phpEx, true)); exit; } ! else ! { ! $nick = str_replace(" ", "_", $userdata['username']); ! } } ! $help = mx_append_sid(PORTAL_URL . "modules/mx_pjirc/pjirc_faq.".$phpEx); $page_title = $lang['Chat_Room']; *************** *** 105,110 **** 'CHANNEL' => $pjirc_config['irc_channel'], 'QUIT_MESSAGE' => $pjirc_config['irc_quit'], ! // 'S_QUIT_CHAT' => append_sid($module_root_path.'pjirc_drop.'.$phpEx), ! 'S_QUIT_CHAT' => append_sid($module_root_path.'pjirc_update.'.$phpEx), 'LANG' => $board_config['default_lang'], 'HELP' => $help, --- 127,132 ---- 'CHANNEL' => $pjirc_config['irc_channel'], 'QUIT_MESSAGE' => $pjirc_config['irc_quit'], ! // 'S_QUIT_CHAT' => mx_append_sid($module_root_path.'pjirc_drop.'.$phpEx), ! 'S_QUIT_CHAT' => mx_append_sid($module_root_path.'pjirc_update.'.$phpEx), 'LANG' => $board_config['default_lang'], 'HELP' => $help, *************** *** 134,136 **** $template->pparse('body'); ! ?> \ No newline at end of file --- 156,158 ---- $template->pparse('body'); ! ?> Index: pjirc_front.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_front.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pjirc_front.php 8 Feb 2008 23:43:00 -0000 1.3 --- pjirc_front.php 9 Feb 2008 11:32:09 -0000 1.4 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006 smartor, amo, OryNider --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006 smartor, amo, OryNider *************** *** 69,77 **** $isimler[$i++] = $record['username']; ! // Checks if guests are allowed ! if( $pjirc_config['irc_allow_guests'] ) ! { ! if ( !$userdata['session_logged_in'] ) ! { if ($record['username']==$userdata['username']) { --- 69,77 ---- $isimler[$i++] = $record['username']; ! // Checks if guests are allowed ! if( $pjirc_config['irc_allow_guests'] ) ! { ! if ( !$userdata['session_logged_in'] ) ! { if ($record['username']==$userdata['username']) { *************** *** 84,88 **** } else ! { if ( $pjirc_config['show_chat_select'] ) { --- 84,88 ---- } else ! { if ( $pjirc_config['show_chat_select'] ) { *************** *** 97,106 **** $can_join="yes"; } ! } ! } ! else { ! if ( !$userdata['session_logged_in'] ) ! { if ($record['username']==$userdata['username']) { --- 97,106 ---- $can_join="yes"; } ! } ! } ! else { ! if ( !$userdata['session_logged_in'] ) ! { if ($record['username']==$userdata['username']) { *************** *** 113,117 **** } else ! { if ( $pjirc_config['show_chat_select'] ) { --- 113,117 ---- } else ! { if ( $pjirc_config['show_chat_select'] ) { *************** *** 128,166 **** } ! } } if (!isset($can_join) || empty($can_join)) { ! if( $pjirc_config['irc_allow_guests'] ) ! { ! if ( !$userdata['session_logged_in'] ) ! { $can_join="yes"; } else ! { $can_join="yes"; ! } ! } ! else { ! if ( !$userdata['session_logged_in'] ) ! { $can_join="no"; } else ! { $can_join="yes"; } } } ! $chatters = ( empty($isimler[1]) ? '' : ! '<a href="' . append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[1]) . '" >'.$isimler[1].'</a><br />' ); for($s = 2; $s <= $isimler[0]; $s++) { ! $chatters .= ', <a href="' . append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[$s]) . '" >'.$isimler[$s].'</a><br />'; } --- 128,166 ---- } ! } } if (!isset($can_join) || empty($can_join)) { ! if( $pjirc_config['irc_allow_guests'] ) ! { ! if ( !$userdata['session_logged_in'] ) ! { $can_join="yes"; } else ! { $can_join="yes"; ! } ! } ! else { ! if ( !$userdata['session_logged_in'] ) ! { $can_join="no"; } else ! { $can_join="yes"; } } } ! $chatters = ( empty($isimler[1]) ? '' : ! '<a href="' . mx_append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[1]) . '" >'.$isimler[1].'</a><br />' ); for($s = 2; $s <= $isimler[0]; $s++) { ! $chatters .= ', <a href="' . mx_append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[$s]) . '" >'.$isimler[$s].'</a><br />'; } *************** *** 175,180 **** ! if ( !$userdata['session_logged_in'] ) ! { //$template->assign_block_vars('switch_user_logged_out', array()); --- 175,180 ---- ! if ( !$userdata['session_logged_in'] ) ! { //$template->assign_block_vars('switch_user_logged_out', array()); *************** *** 189,193 **** } else ! { if ( $can_join=="no") { --- 189,193 ---- } else ! { if ( $can_join=="no") { *************** *** 217,221 **** 'CHATTERS_LIST' => $chatters_list, 'L_CLICK_TO_JOIN_CHAT' => $lang['Click_to_join_chat'], ! 'S_JOIN_CHAT' => append_sid(PORTAL_URL . 'modules/mx_pjirc/index.php'), 'L_LOGIN_TO_JOIN_CHAT' => $lang['Login_to_join_chat'], 'L_ALREADY_CHATTING' => $lang['Already_chatting'], --- 217,221 ---- 'CHATTERS_LIST' => $chatters_list, 'L_CLICK_TO_JOIN_CHAT' => $lang['Click_to_join_chat'], ! 'S_JOIN_CHAT' => mx_append_sid(PORTAL_URL . 'modules/mx_pjirc/index.php'), 'L_LOGIN_TO_JOIN_CHAT' => $lang['Login_to_join_chat'], 'L_ALREADY_CHATTING' => $lang['Already_chatting'], *************** *** 229,231 **** unset($chatters, $block_config, $sql, $howmanychat, $chatters_list, $block_size, $module_root_path, $isimler, $can_join); ! ?> \ No newline at end of file --- 229,231 ---- unset($chatters, $block_config, $sql, $howmanychat, $chatters_list, $block_size, $module_root_path, $isimler, $can_join); ! ?> Index: pjirc_update.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_update.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pjirc_update.php 7 Jun 2007 00:08:36 -0000 1.1 --- pjirc_update.php 9 Feb 2008 11:32:09 -0000 1.2 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006 amo, am...@ho... --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006 amo, am...@ho... Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/db_install.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** db_install.php 8 Feb 2008 23:42:59 -0000 1.3 --- db_install.php 9 Feb 2008 11:32:09 -0000 1.4 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006, amo, am...@ho... --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006, amo, am...@ho... *************** *** 111,113 **** echo "</table><br />"; ! ?> \ No newline at end of file --- 111,113 ---- echo "</table><br />"; ! ?> Index: pjirc_faq.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_faq.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pjirc_faq.php 8 Feb 2008 23:42:59 -0000 1.2 --- pjirc_faq.php 9 Feb 2008 11:32:09 -0000 1.3 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2001-2007 The phpBB Group, su...@ph... --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2001-2007 The phpBB Group, su...@ph... *************** *** 13,17 **** $mx_root_path = "../../"; $mx_module_path = "./"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); include_once($mx_root_path . 'common.'.$phpEx); --- 13,17 ---- $mx_root_path = "../../"; $mx_module_path = "./"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); include_once($mx_root_path . 'common.'.$phpEx); *************** *** 19,23 **** // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management --- 19,23 ---- // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management *************** *** 101,105 **** 'ROW_COLOR' => '#' . $row_color, 'ROW_CLASS' => $row_class, ! 'FAQ_QUESTION' => $faq_block[$i][$j]['question'], 'FAQ_ANSWER' => $faq_block[$i][$j]['answer'], --- 101,105 ---- 'ROW_COLOR' => '#' . $row_color, 'ROW_CLASS' => $row_class, ! 'FAQ_QUESTION' => $faq_block[$i][$j]['question'], 'FAQ_ANSWER' => $faq_block[$i][$j]['answer'], *************** *** 112,116 **** 'FAQ_LINK' => $faq_block[$i][$j]['question'], ! 'U_FAQ_LINK' => append_sid(PORTAL_URL . 'modules/mx_pjirc/pjirc_faq.php' . '#' . $faq_block[$i][$j]['id']) ) ); } --- 112,116 ---- 'FAQ_LINK' => $faq_block[$i][$j]['question'], ! 'U_FAQ_LINK' => mx_append_sid(PORTAL_URL . 'modules/mx_pjirc/pjirc_faq.php' . '#' . $faq_block[$i][$j]['id']) ) ); } *************** *** 122,124 **** include($mx_root_path . 'includes/page_tail.'.$phpEx); ! ?> \ No newline at end of file --- 122,125 ---- include($mx_root_path . 'includes/page_tail.'.$phpEx); ! ?> ! Index: db_uninstall.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/db_uninstall.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** db_uninstall.php 8 Feb 2008 23:42:59 -0000 1.2 --- db_uninstall.php 9 Feb 2008 11:32:09 -0000 1.3 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006, amo, am...@ho... --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006, amo, am...@ho... *************** *** 13,17 **** { $mx_root_path = '../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); include($mx_root_path . 'common.'.$phpEx); --- 13,17 ---- { $mx_root_path = '../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); include($mx_root_path . 'common.'.$phpEx); *************** *** 62,64 **** echo '<tr><td class="row1" align="center"><span class="gen">' . $message . '</span></td></tr>'; echo '</table> <br />'; ! ?> \ No newline at end of file --- 62,64 ---- echo '<tr><td class="row1" align="center"><span class="gen">' . $message . '</span></td></tr>'; echo '</table> <br />'; ! ?> Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/db_upgrade.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** db_upgrade.php 8 Feb 2008 23:42:59 -0000 1.3 --- db_upgrade.php 9 Feb 2008 11:32:09 -0000 1.4 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2002-2006 [Jon Ohlsson] mxBB Project Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2002-2006 [Jon Ohlsson] mxBB Project Team *************** *** 90,92 **** echo "</table><br />"; ! ?> \ No newline at end of file --- 90,92 ---- echo "</table><br />"; ! ?> |
|
From: OryNider <ory...@us...> - 2008-02-09 11:32:14
|
Update of /cvsroot/mxbb/mx_pjirc/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690/includes Modified Files: common.php Log Message: upgrade Index: common.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/includes/common.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** common.php 8 Feb 2008 23:43:00 -0000 1.2 --- common.php 9 Feb 2008 11:32:09 -0000 1.3 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006 Marc Ferran; Eric; Amo --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2004-2006 Marc Ferran; Eric; Amo *************** *** 39,66 **** define('PJIRC_SESSION_TABLE', $mx_table_prefix.'pjirc_session'); // // Load language files. // ! if( file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx) ) ! { ! include($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx); ! } ! else ! { ! include($module_root_path . 'language/lang_english/lang_admin.' . $phpEx); ! } ! if( file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) ) { ! include($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); } ! else { ! include($module_root_path . 'language/lang_english/lang_main.' . $phpEx); } // // Common definitions... // - $cfg_chatname = $board_config['sitename'] . ' -> ' . 'Pjirc'; --- 39,69 ---- define('PJIRC_SESSION_TABLE', $mx_table_prefix.'pjirc_session'); + $default_lang = ($mx_user->lang['default_lang']) ? $mx_user->lang['default_lang'] : $board_config['default_lang']; + // // Load language files. // ! if ((@include $module_root_path . "language/lang_" . $default_lang . "/lang_admin.$phpEx") === false) { ! if ((@include $module_root_path . "language/lang_english/lang_admin.$phpEx") === false) ! { ! mx_message_die(CRITICAL_ERROR, 'Language file ' . $module_root_path . "language/lang_" . $default_lang . "/lang_admin.$phpEx" . ' couldn\'t be opened.'); ! } } ! ! /* ! if ((@include $module_root_path . "language/lang_" . $default_lang . "/lang_main.$phpEx") === false) { ! if ((@include $module_root_path . "language/lang_english/lang_main.$phpEx") === false) ! { ! mx_message_die(CRITICAL_ERROR, 'Language file ' . $module_root_path . "language/lang_" . $default_lang . "/lang_main.$phpEx" . ' couldn\'t be opened.'); ! } } + */ + $mx_user->extend(MX_LANG_MAIN, MX_IMAGES_NONE); // // Common definitions... // $cfg_chatname = $board_config['sitename'] . ' -> ' . 'Pjirc'; *************** *** 81,85 **** if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, "Couldn't query pjirc config table", "", __LINE__, __FILE__, $sql); } else --- 84,88 ---- if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't query pjirc config table", "", __LINE__, __FILE__, $sql); } else *************** *** 147,149 **** } } ! ?> \ No newline at end of file --- 150,152 ---- } } ! ?> |
|
From: OryNider <ory...@us...> - 2008-02-09 11:32:13
|
Update of /cvsroot/mxbb/mx_pjirc/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690/admin Modified Files: admin_pjirc.php Log Message: upgrade Index: admin_pjirc.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/admin/admin_pjirc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_pjirc.php 8 Feb 2008 23:42:59 -0000 1.3 --- admin_pjirc.php 9 Feb 2008 11:32:09 -0000 1.4 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 Marc Ferran; Eric; Amo --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 Marc Ferran; Eric; Amo *************** *** 34,38 **** // Setup basic portal stuff... // ! define('IN_PORTAL', true); $mx_root_path = '../../../'; $module_root_path = "../"; --- 34,38 ---- // Setup basic portal stuff... // ! @define('IN_PORTAL', true); $mx_root_path = '../../../'; $module_root_path = "../"; *************** *** 41,46 **** // Security and page header... // ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! require($mx_root_path . '/admin/pagestart.'.$phpEx); // --- 41,46 ---- // Security and page header... // ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! require($mx_root_path . 'admin/pagestart.'.$phpEx); // *************** *** 52,56 **** // Send page header... // ! include_once($mx_root_path . 'admin/page_header_admin.'.$phpEx); --- 52,56 ---- // Send page header... // ! //include_once($mx_root_path . 'admin/page_header_admin.'.$phpEx); *************** *** 65,69 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Couldn't query pjirc config table", "", __LINE__, __FILE__, $sql); } while( $row = $db->sql_fetchrow($result) ) --- 65,69 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Couldn't query pjirc config table", "", __LINE__, __FILE__, $sql); } while( $row = $db->sql_fetchrow($result) ) *************** *** 81,85 **** if( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Failed to update pjirc configuration for $config_name", "", __LINE__, __FILE__, $sql); } } --- 81,85 ---- if( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Failed to update pjirc configuration for $config_name", "", __LINE__, __FILE__, $sql); } } *************** *** 89,97 **** if ($new['background_image_on']=="true") { ! $bg_image_on_off="<select name=\"background_image_on\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $bg_image_on_off="<select name=\"background_image_on\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } --- 89,97 ---- if ($new['background_image_on']=="true") { ! $bg_image_on_off="<select name=\"background_image_on\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $bg_image_on_off="<select name=\"background_image_on\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } *************** *** 99,107 **** if ($new['show_status']=="true") { ! $show_status="<select name=\"show_status\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_status="<select name=\"show_status\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } --- 99,107 ---- if ($new['show_status']=="true") { ! $show_status="<select name=\"show_status\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_status="<select name=\"show_status\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } *************** *** 109,117 **** if ($new['show_connect']=="true") { ! $show_connect="<select name=\"show_connect\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_connect="<select name=\"show_connect\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } --- 109,117 ---- if ($new['show_connect']=="true") { ! $show_connect="<select name=\"show_connect\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_connect="<select name=\"show_connect\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } *************** *** 119,127 **** if ($new['show_chanlist']=="true") { ! $show_chanlist="<select name=\"show_chanlist\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_chanlist="<select name=\"show_chanlist\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } --- 119,127 ---- if ($new['show_chanlist']=="true") { ! $show_chanlist="<select name=\"show_chanlist\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_chanlist="<select name=\"show_chanlist\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } *************** *** 129,137 **** if ($new['show_dock']=="true") { ! $show_dock="<select name=\"show_dock\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_dock="<select name=\"show_dock\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } --- 129,137 ---- if ($new['show_dock']=="true") { ! $show_dock="<select name=\"show_dock\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_dock="<select name=\"show_dock\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } *************** *** 148,156 **** if (is_uploaded_file ($_FILES['background_image']['tmp_name'])) { ! if (file_exists($module_root_path . "pjirc/background.jpg")) ! { ! unlink($module_root_path . "pjirc/background.jpg"); ! } ! copy($_FILES['background_image']['tmp_name'], $module_root_path . "pjirc/background.jpg"); } --- 148,156 ---- if (is_uploaded_file ($_FILES['background_image']['tmp_name'])) { ! if (file_exists($module_root_path . "pjirc/background.jpg")) ! { ! unlink($module_root_path . "pjirc/background.jpg"); ! } ! copy($_FILES['background_image']['tmp_name'], $module_root_path . "pjirc/background.jpg"); } *************** *** 162,168 **** $message = $lang['Pjirc_Settings_updated'] . '<br /><br />' . ! sprintf($lang['Pjirc_Settings_return'], '<a href="' . append_sid("admin_pjirc.$phpEx") . '">', '</a>') . '<br /><br />' . ! sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); message_die(GENERAL_MESSAGE, $message); } --- 162,168 ---- $message = $lang['Pjirc_Settings_updated'] . '<br /><br />' . ! sprintf($lang['Pjirc_Settings_return'], '<a href="' . mx_append_sid("admin_pjirc.$phpEx") . '">', '</a>') . '<br /><br />' . ! sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); message_die(GENERAL_MESSAGE, $message); } *************** *** 213,356 **** for($i=0; $colors[$i]; $i++) { ! if ($new['button_surround']==$colors[$i]) ! { ! $button_surround.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_surround.="<option style='color: #".$colors[$i]."'".$colors[$i]."'>$colors[$i]</option>"; ! } } //3D_BUTTON_HIGHLIGHT for($i=0; $colors[$i]; $i++) { ! if ($new['3d_button_highlight']==$colors[$i]) ! { ! $button_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //3D_BUTTON_SHADOW for($i=0; $colors[$i]; $i++) { ! if ($new['3d_button_shadow']==$colors[$i]) ! { ! $button_shadow.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_shadow.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //SCROLLBAR for($i=0; $colors[$i]; $i++) { ! if ($new['scrollbar_top']==$colors[$i]) ! { ! $scrollbar.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $scrollbar.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //SCROLLBAR_HIGHLIGHT for($i=0; $colors[$i]; $i++) { ! if ($new['scrollbar_highlight']==$colors[$i]) ! { ! $scrollbar_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $scrollbar_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //BUTTON_BACKGROUND for($i=0; $colors[$i]; $i++) { ! if ($new['button_background']==$colors[$i]) ! { ! $button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'UI_BACKGROUND' for($i=0; $colors[$i]; $i++) { ! if ($new['ui_background']==$colors[$i]) ! { ! $ui_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $ui_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'WINDOW_BUTTON_BACKGROUND' for($i=0; $colors[$i]; $i++) { ! if ($new['window_button_background']==$colors[$i]) ! { ! $window_button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $window_button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'MDI_BUTTONS_BACKGROUND' for($i=0; $colors[$i]; $i++) { ! if ($new['mdi_buttons_background']==$colors[$i]) ! { ! $mdi_buttons_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $mdi_buttons_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'USER_STATE_BUTTON' for($i=0; $colors[$i]; $i++) { ! if ($new['user_state_button']==$colors[$i]) ! { ! $user_state_button.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $user_state_button.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'ALERT_UPDATE_CHANNEL' for($i=0; $colors[$i]; $i++) { ! if ($new['alert_update_channel']==$colors[$i]) ! { ! $alert_update_channel.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $alert_update_channel.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'USER_BUTTONS' for($i=0; $colors[$i]; $i++) { ! if ($new['user_buttons']==$colors[$i]) ! { ! $user_buttons.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $user_buttons.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } --- 213,356 ---- for($i=0; $colors[$i]; $i++) { ! if ($new['button_surround']==$colors[$i]) ! { ! $button_surround.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_surround.="<option style='color: #".$colors[$i]."'".$colors[$i]."'>$colors[$i]</option>"; ! } } //3D_BUTTON_HIGHLIGHT for($i=0; $colors[$i]; $i++) { ! if ($new['3d_button_highlight']==$colors[$i]) ! { ! $button_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //3D_BUTTON_SHADOW for($i=0; $colors[$i]; $i++) { ! if ($new['3d_button_shadow']==$colors[$i]) ! { ! $button_shadow.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_shadow.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //SCROLLBAR for($i=0; $colors[$i]; $i++) { ! if ($new['scrollbar_top']==$colors[$i]) ! { ! $scrollbar.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $scrollbar.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //SCROLLBAR_HIGHLIGHT for($i=0; $colors[$i]; $i++) { ! if ($new['scrollbar_highlight']==$colors[$i]) ! { ! $scrollbar_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $scrollbar_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //BUTTON_BACKGROUND for($i=0; $colors[$i]; $i++) { ! if ($new['button_background']==$colors[$i]) ! { ! $button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'UI_BACKGROUND' for($i=0; $colors[$i]; $i++) { ! if ($new['ui_background']==$colors[$i]) ! { ! $ui_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $ui_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'WINDOW_BUTTON_BACKGROUND' for($i=0; $colors[$i]; $i++) { ! if ($new['window_button_background']==$colors[$i]) ! { ! $window_button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $window_button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'MDI_BUTTONS_BACKGROUND' for($i=0; $colors[$i]; $i++) { ! if ($new['mdi_buttons_background']==$colors[$i]) ! { ! $mdi_buttons_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $mdi_buttons_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'USER_STATE_BUTTON' for($i=0; $colors[$i]; $i++) { ! if ($new['user_state_button']==$colors[$i]) ! { ! $user_state_button.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $user_state_button.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'ALERT_UPDATE_CHANNEL' for($i=0; $colors[$i]; $i++) { ! if ($new['alert_update_channel']==$colors[$i]) ! { ! $alert_update_channel.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $alert_update_channel.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'USER_BUTTONS' for($i=0; $colors[$i]; $i++) { ! if ($new['user_buttons']==$colors[$i]) ! { ! $user_buttons.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $user_buttons.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } *************** *** 360,364 **** $template->assign_vars(array( ! 'S_ACTION' => append_sid("admin_pjirc.$phpEx"), 'L_PJIRC_SETTINGS' => $lang['Pjirc_Settings'], 'L_PJIRC_SETTINGS_EXPLAIN' => $lang['Pjirc_Settings_explain'], --- 360,364 ---- $template->assign_vars(array( ! 'S_ACTION' => mx_append_sid("admin_pjirc.$phpEx"), 'L_PJIRC_SETTINGS' => $lang['Pjirc_Settings'], 'L_PJIRC_SETTINGS_EXPLAIN' => $lang['Pjirc_Settings_explain'], *************** *** 400,404 **** 'L_ALLOW_GUESTS' => $lang['IRC_allow_guests'], 'L_GUESTNAME' => $lang['IRC_guestname'], ! 'L_GUESTNAME_EXPLAIN' => $lang['IRC_guestname_explain'], "L_NO" => $lang['No'], --- 400,404 ---- 'L_ALLOW_GUESTS' => $lang['IRC_allow_guests'], 'L_GUESTNAME' => $lang['IRC_guestname'], ! 'L_GUESTNAME_EXPLAIN' => $lang['IRC_guestname_explain'], "L_NO" => $lang['No'], *************** *** 446,448 **** include_once($mx_root_path . 'admin/page_footer_admin.' . $phpEx); ! ?> \ No newline at end of file --- 446,448 ---- include_once($mx_root_path . 'admin/page_footer_admin.' . $phpEx); ! ?> |
|
From: OryNider <ory...@us...> - 2008-02-09 11:30:57
|
Update of /cvsroot/mxbb/mx_pjirc/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7491/admin Log Message: Directory /cvsroot/mxbb/mx_pjirc/templates/_core/admin added to the repository |
|
From: OryNider <ory...@us...> - 2008-02-09 11:30:45
|
Update of /cvsroot/mxbb/mx_pjirc/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7471/_core Log Message: Directory /cvsroot/mxbb/mx_pjirc/templates/_core added to the repository |
|
From: OryNider <ory...@us...> - 2008-02-09 11:29:12
|
Update of /cvsroot/mxbb/mx_pjirc/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7364/admin Modified Files: Tag: core28x admin_pjirc.php Log Message: mxBB -> Mx-Publisher Index: admin_pjirc.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/admin/admin_pjirc.php,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** admin_pjirc.php 9 Feb 2008 09:43:38 -0000 1.2.2.1 --- admin_pjirc.php 9 Feb 2008 11:29:08 -0000 1.2.2.2 *************** *** 34,38 **** // Setup basic portal stuff... // ! define('IN_PORTAL', true); $mx_root_path = '../../../'; $module_root_path = "../"; --- 34,38 ---- // Setup basic portal stuff... // ! @define('IN_PORTAL', true); $mx_root_path = '../../../'; $module_root_path = "../"; *************** *** 42,46 **** // $phpEx = substr(strrchr(__FILE__, '.'), 1); ! require($mx_root_path . '/admin/pagestart.'.$phpEx); // --- 42,46 ---- // $phpEx = substr(strrchr(__FILE__, '.'), 1); ! require($mx_root_path . 'admin/pagestart.'.$phpEx); // *************** *** 52,56 **** // Send page header... // ! include_once($mx_root_path . 'admin/page_header_admin.'.$phpEx); --- 52,56 ---- // Send page header... // ! //include_once($mx_root_path . 'admin/page_header_admin.'.$phpEx); *************** *** 65,69 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Couldn't query pjirc config table", "", __LINE__, __FILE__, $sql); } while( $row = $db->sql_fetchrow($result) ) --- 65,69 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Couldn't query pjirc config table", "", __LINE__, __FILE__, $sql); } while( $row = $db->sql_fetchrow($result) ) *************** *** 81,85 **** if( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Failed to update pjirc configuration for $config_name", "", __LINE__, __FILE__, $sql); } } --- 81,85 ---- if( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Failed to update pjirc configuration for $config_name", "", __LINE__, __FILE__, $sql); } } *************** *** 89,97 **** if ($new['background_image_on']=="true") { ! $bg_image_on_off="<select name=\"background_image_on\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $bg_image_on_off="<select name=\"background_image_on\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } --- 89,97 ---- if ($new['background_image_on']=="true") { ! $bg_image_on_off="<select name=\"background_image_on\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $bg_image_on_off="<select name=\"background_image_on\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } *************** *** 99,107 **** if ($new['show_status']=="true") { ! $show_status="<select name=\"show_status\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_status="<select name=\"show_status\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } --- 99,107 ---- if ($new['show_status']=="true") { ! $show_status="<select name=\"show_status\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_status="<select name=\"show_status\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } *************** *** 109,117 **** if ($new['show_connect']=="true") { ! $show_connect="<select name=\"show_connect\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_connect="<select name=\"show_connect\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } --- 109,117 ---- if ($new['show_connect']=="true") { ! $show_connect="<select name=\"show_connect\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_connect="<select name=\"show_connect\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } *************** *** 119,127 **** if ($new['show_chanlist']=="true") { ! $show_chanlist="<select name=\"show_chanlist\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_chanlist="<select name=\"show_chanlist\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } --- 119,127 ---- if ($new['show_chanlist']=="true") { ! $show_chanlist="<select name=\"show_chanlist\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_chanlist="<select name=\"show_chanlist\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } *************** *** 129,137 **** if ($new['show_dock']=="true") { ! $show_dock="<select name=\"show_dock\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_dock="<select name=\"show_dock\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } --- 129,137 ---- if ($new['show_dock']=="true") { ! $show_dock="<select name=\"show_dock\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; } else { ! $show_dock="<select name=\"show_dock\" size=1><option value=\"true\">on<option value=\"false\" selected>off</select>"; } *************** *** 148,156 **** if (is_uploaded_file ($_FILES['background_image']['tmp_name'])) { ! if (file_exists($module_root_path . "pjirc/background.jpg")) ! { ! unlink($module_root_path . "pjirc/background.jpg"); ! } ! copy($_FILES['background_image']['tmp_name'], $module_root_path . "pjirc/background.jpg"); } --- 148,156 ---- if (is_uploaded_file ($_FILES['background_image']['tmp_name'])) { ! if (file_exists($module_root_path . "pjirc/background.jpg")) ! { ! unlink($module_root_path . "pjirc/background.jpg"); ! } ! copy($_FILES['background_image']['tmp_name'], $module_root_path . "pjirc/background.jpg"); } *************** *** 162,168 **** $message = $lang['Pjirc_Settings_updated'] . '<br /><br />' . ! sprintf($lang['Pjirc_Settings_return'], '<a href="' . append_sid("admin_pjirc.$phpEx") . '">', '</a>') . '<br /><br />' . ! sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); message_die(GENERAL_MESSAGE, $message); } --- 162,168 ---- $message = $lang['Pjirc_Settings_updated'] . '<br /><br />' . ! sprintf($lang['Pjirc_Settings_return'], '<a href="' . mx_append_sid("admin_pjirc.$phpEx") . '">', '</a>') . '<br /><br />' . ! sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); message_die(GENERAL_MESSAGE, $message); } *************** *** 213,356 **** for($i=0; $colors[$i]; $i++) { ! if ($new['button_surround']==$colors[$i]) ! { ! $button_surround.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_surround.="<option style='color: #".$colors[$i]."'".$colors[$i]."'>$colors[$i]</option>"; ! } } //3D_BUTTON_HIGHLIGHT for($i=0; $colors[$i]; $i++) { ! if ($new['3d_button_highlight']==$colors[$i]) ! { ! $button_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //3D_BUTTON_SHADOW for($i=0; $colors[$i]; $i++) { ! if ($new['3d_button_shadow']==$colors[$i]) ! { ! $button_shadow.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_shadow.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //SCROLLBAR for($i=0; $colors[$i]; $i++) { ! if ($new['scrollbar_top']==$colors[$i]) ! { ! $scrollbar.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $scrollbar.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //SCROLLBAR_HIGHLIGHT for($i=0; $colors[$i]; $i++) { ! if ($new['scrollbar_highlight']==$colors[$i]) ! { ! $scrollbar_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $scrollbar_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //BUTTON_BACKGROUND for($i=0; $colors[$i]; $i++) { ! if ($new['button_background']==$colors[$i]) ! { ! $button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'UI_BACKGROUND' for($i=0; $colors[$i]; $i++) { ! if ($new['ui_background']==$colors[$i]) ! { ! $ui_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $ui_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'WINDOW_BUTTON_BACKGROUND' for($i=0; $colors[$i]; $i++) { ! if ($new['window_button_background']==$colors[$i]) ! { ! $window_button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $window_button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'MDI_BUTTONS_BACKGROUND' for($i=0; $colors[$i]; $i++) { ! if ($new['mdi_buttons_background']==$colors[$i]) ! { ! $mdi_buttons_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $mdi_buttons_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'USER_STATE_BUTTON' for($i=0; $colors[$i]; $i++) { ! if ($new['user_state_button']==$colors[$i]) ! { ! $user_state_button.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $user_state_button.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'ALERT_UPDATE_CHANNEL' for($i=0; $colors[$i]; $i++) { ! if ($new['alert_update_channel']==$colors[$i]) ! { ! $alert_update_channel.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $alert_update_channel.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'USER_BUTTONS' for($i=0; $colors[$i]; $i++) { ! if ($new['user_buttons']==$colors[$i]) ! { ! $user_buttons.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $user_buttons.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } --- 213,356 ---- for($i=0; $colors[$i]; $i++) { ! if ($new['button_surround']==$colors[$i]) ! { ! $button_surround.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_surround.="<option style='color: #".$colors[$i]."'".$colors[$i]."'>$colors[$i]</option>"; ! } } //3D_BUTTON_HIGHLIGHT for($i=0; $colors[$i]; $i++) { ! if ($new['3d_button_highlight']==$colors[$i]) ! { ! $button_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //3D_BUTTON_SHADOW for($i=0; $colors[$i]; $i++) { ! if ($new['3d_button_shadow']==$colors[$i]) ! { ! $button_shadow.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_shadow.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //SCROLLBAR for($i=0; $colors[$i]; $i++) { ! if ($new['scrollbar_top']==$colors[$i]) ! { ! $scrollbar.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $scrollbar.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //SCROLLBAR_HIGHLIGHT for($i=0; $colors[$i]; $i++) { ! if ($new['scrollbar_highlight']==$colors[$i]) ! { ! $scrollbar_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $scrollbar_highlight.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //BUTTON_BACKGROUND for($i=0; $colors[$i]; $i++) { ! if ($new['button_background']==$colors[$i]) ! { ! $button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'UI_BACKGROUND' for($i=0; $colors[$i]; $i++) { ! if ($new['ui_background']==$colors[$i]) ! { ! $ui_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $ui_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'WINDOW_BUTTON_BACKGROUND' for($i=0; $colors[$i]; $i++) { ! if ($new['window_button_background']==$colors[$i]) ! { ! $window_button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $window_button_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'MDI_BUTTONS_BACKGROUND' for($i=0; $colors[$i]; $i++) { ! if ($new['mdi_buttons_background']==$colors[$i]) ! { ! $mdi_buttons_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $mdi_buttons_background.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'USER_STATE_BUTTON' for($i=0; $colors[$i]; $i++) { ! if ($new['user_state_button']==$colors[$i]) ! { ! $user_state_button.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $user_state_button.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'ALERT_UPDATE_CHANNEL' for($i=0; $colors[$i]; $i++) { ! if ($new['alert_update_channel']==$colors[$i]) ! { ! $alert_update_channel.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $alert_update_channel.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } //'USER_BUTTONS' for($i=0; $colors[$i]; $i++) { ! if ($new['user_buttons']==$colors[$i]) ! { ! $user_buttons.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."' SELECTED>$colors[$i]</option>"; ! } ! else ! { ! $user_buttons.="<option style='color: #".$colors[$i]."' value='".$colors[$i]."'>$colors[$i]</option>"; ! } } *************** *** 360,364 **** $template->assign_vars(array( ! 'S_ACTION' => append_sid("admin_pjirc.$phpEx"), 'L_PJIRC_SETTINGS' => $lang['Pjirc_Settings'], 'L_PJIRC_SETTINGS_EXPLAIN' => $lang['Pjirc_Settings_explain'], --- 360,364 ---- $template->assign_vars(array( ! 'S_ACTION' => mx_append_sid("admin_pjirc.$phpEx"), 'L_PJIRC_SETTINGS' => $lang['Pjirc_Settings'], 'L_PJIRC_SETTINGS_EXPLAIN' => $lang['Pjirc_Settings_explain'], *************** *** 400,404 **** 'L_ALLOW_GUESTS' => $lang['IRC_allow_guests'], 'L_GUESTNAME' => $lang['IRC_guestname'], ! 'L_GUESTNAME_EXPLAIN' => $lang['IRC_guestname_explain'], "L_NO" => $lang['No'], --- 400,404 ---- 'L_ALLOW_GUESTS' => $lang['IRC_allow_guests'], 'L_GUESTNAME' => $lang['IRC_guestname'], ! 'L_GUESTNAME_EXPLAIN' => $lang['IRC_guestname_explain'], "L_NO" => $lang['No'], |
|
From: OryNider <ory...@us...> - 2008-02-09 11:29:12
|
Update of /cvsroot/mxbb/mx_pjirc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7364 Modified Files: Tag: core28x index.php pjirc_chat.php pjirc_faq.php pjirc_front.php Log Message: mxBB -> Mx-Publisher Index: pjirc_chat.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_chat.php,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** pjirc_chat.php 9 Feb 2008 09:43:38 -0000 1.3.2.1 --- pjirc_chat.php 9 Feb 2008 11:29:08 -0000 1.3.2.2 *************** *** 63,67 **** if ( !$userdata['session_logged_in'] ) { ! mx_redirect(append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/pjirc_chat.".$phpEx, true)); exit; } --- 63,67 ---- if ( !$userdata['session_logged_in'] ) { ! mx_redirect(mx_append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/pjirc_chat.".$phpEx, true)); exit; } *************** *** 90,94 **** $nick = str_replace(" ", "_", $pjirc_config['irc_guestname']); ! mx_redirect(append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/pjirc_chat.".$phpEx, true)); exit; } --- 90,94 ---- $nick = str_replace(" ", "_", $pjirc_config['irc_guestname']); ! mx_redirect(mx_append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/pjirc_chat.".$phpEx, true)); exit; } *************** *** 99,103 **** } ! $help = append_sid(PORTAL_URL . "modules/mx_pjirc/pjirc_faq.".$phpEx); $page_title = $lang['Chat_Room']; --- 99,103 ---- } ! $help = mx_append_sid(PORTAL_URL . "modules/mx_pjirc/pjirc_faq.".$phpEx); $page_title = $lang['Chat_Room']; *************** *** 127,132 **** 'CHANNEL' => $pjirc_config['irc_channel'], 'QUIT_MESSAGE' => $pjirc_config['irc_quit'], ! // 'S_QUIT_CHAT' => append_sid($module_root_path.'pjirc_drop.'.$phpEx), ! 'S_QUIT_CHAT' => append_sid($module_root_path.'pjirc_update.'.$phpEx), 'LANG' => $board_config['default_lang'], 'HELP' => $help, --- 127,132 ---- 'CHANNEL' => $pjirc_config['irc_channel'], 'QUIT_MESSAGE' => $pjirc_config['irc_quit'], ! // 'S_QUIT_CHAT' => mx_append_sid($module_root_path.'pjirc_drop.'.$phpEx), ! 'S_QUIT_CHAT' => mx_append_sid($module_root_path.'pjirc_update.'.$phpEx), 'LANG' => $board_config['default_lang'], 'HELP' => $help, Index: pjirc_faq.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_faq.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pjirc_faq.php 9 Feb 2008 09:43:38 -0000 1.1.2.1 --- pjirc_faq.php 9 Feb 2008 11:29:08 -0000 1.1.2.2 *************** *** 112,116 **** 'FAQ_LINK' => $faq_block[$i][$j]['question'], ! 'U_FAQ_LINK' => append_sid(PORTAL_URL . 'modules/mx_pjirc/pjirc_faq.php' . '#' . $faq_block[$i][$j]['id']) ) ); } --- 112,116 ---- 'FAQ_LINK' => $faq_block[$i][$j]['question'], ! 'U_FAQ_LINK' => mx_append_sid(PORTAL_URL . 'modules/mx_pjirc/pjirc_faq.php' . '#' . $faq_block[$i][$j]['id']) ) ); } Index: index.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/index.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** index.php 9 Feb 2008 09:43:38 -0000 1.1.2.1 --- index.php 9 Feb 2008 11:29:08 -0000 1.1.2.2 *************** *** 9,35 **** */ ! define('IN_PORTAL', 1); ! //Turn On Error Reporting ! //error_reporting( E_ALL ); ! $mx_root_path = "../../"; ! $mx_module_path = "./"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.'.$phpEx); ! // ! //Start session management ! // ! $mx_user->init($user_ip, PAGE_INDEX); ! define('_PJIRC_CONFIG', true); ! include_once($mx_module_path .'includes/common.'.$phpEx); /* if ( !$userdata['session_logged_in'] ) { ! redirect(append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/chat.".$phpEx, true)); exit; } --- 9,57 ---- */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) ! { ! define('IN_PORTAL', true); ! $mx_root_path = "../../"; ! $module_root_path = "./"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.'.$phpEx); ! // ! // Start session management ! // ! $mx_user->init($user_ip, PAGE_INDEX); ! // ! // End session management ! // ! $title = 'Media Player Radio'; ! $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '315' ); ! $is_block = FALSE; ! } ! else ! { ! // ! // Read block Configuration ! // ! ! $title = $mx_block->block_info['block_title']; ! $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); ! ! if( is_object($mx_block)) ! { ! $is_block = TRUE; ! } ! } ! ! define('_PJIRC_CONFIG', true); ! include_once($mx_module_path .'includes/common.'.$phpEx); /* if ( !$userdata['session_logged_in'] ) { ! redirect(mx_append_sid($mx_root_path."login.".$phpEx."?redirect=modules/mx_pjirc/chat.".$phpEx, true)); exit; } Index: pjirc_front.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_front.php,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pjirc_front.php 9 Feb 2008 09:43:38 -0000 1.2.2.1 --- pjirc_front.php 9 Feb 2008 11:29:08 -0000 1.2.2.2 *************** *** 159,166 **** $chatters = ( empty($isimler[1]) ? '' : ! '<a href="' . append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[1]) . '" >'.$isimler[1].'</a><br />' ); for($s = 2; $s <= $isimler[0]; $s++) { ! $chatters .= ', <a href="' . append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[$s]) . '" >'.$isimler[$s].'</a><br />'; } --- 159,166 ---- $chatters = ( empty($isimler[1]) ? '' : ! '<a href="' . mx_append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[1]) . '" >'.$isimler[1].'</a><br />' ); for($s = 2; $s <= $isimler[0]; $s++) { ! $chatters .= ', <a href="' . mx_append_sid( PHPBB_URL . 'profile.php?mode=viewprofile&u='.$isimler[$s]) . '" >'.$isimler[$s].'</a><br />'; } *************** *** 217,221 **** 'CHATTERS_LIST' => $chatters_list, 'L_CLICK_TO_JOIN_CHAT' => $lang['Click_to_join_chat'], ! 'S_JOIN_CHAT' => append_sid(PORTAL_URL . 'modules/mx_pjirc/index.php'), 'L_LOGIN_TO_JOIN_CHAT' => $lang['Login_to_join_chat'], 'L_ALREADY_CHATTING' => $lang['Already_chatting'], --- 217,221 ---- 'CHATTERS_LIST' => $chatters_list, 'L_CLICK_TO_JOIN_CHAT' => $lang['Click_to_join_chat'], ! 'S_JOIN_CHAT' => mx_append_sid(PORTAL_URL . 'modules/mx_pjirc/index.php'), 'L_LOGIN_TO_JOIN_CHAT' => $lang['Login_to_join_chat'], 'L_ALREADY_CHATTING' => $lang['Already_chatting'], |
|
From: OryNider <ory...@us...> - 2008-02-09 11:29:12
|
Update of /cvsroot/mxbb/mx_pjirc/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7364/includes Modified Files: Tag: core28x common.php Log Message: mxBB -> Mx-Publisher Index: common.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/includes/common.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** common.php 9 Feb 2008 09:43:39 -0000 1.1.2.1 --- common.php 9 Feb 2008 11:29:08 -0000 1.1.2.2 *************** *** 39,66 **** define('PJIRC_SESSION_TABLE', $mx_table_prefix.'pjirc_session'); // // Load language files. // ! if( file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx) ) ! { ! include($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx); ! } ! else ! { ! include($module_root_path . 'language/lang_english/lang_admin.' . $phpEx); ! } ! if( file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) ) { ! include($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); } ! else { ! include($module_root_path . 'language/lang_english/lang_main.' . $phpEx); } // // Common definitions... // - $cfg_chatname = $board_config['sitename'] . ' -> ' . 'Pjirc'; --- 39,69 ---- define('PJIRC_SESSION_TABLE', $mx_table_prefix.'pjirc_session'); + $default_lang = ($mx_user->lang['default_lang']) ? $mx_user->lang['default_lang'] : $board_config['default_lang']; + // // Load language files. // ! if ((@include $module_root_path . "language/lang_" . $default_lang . "/lang_admin.$phpEx") === false) { ! if ((@include $module_root_path . "language/lang_english/lang_admin.$phpEx") === false) ! { ! mx_message_die(CRITICAL_ERROR, 'Language file ' . $module_root_path . "language/lang_" . $default_lang . "/lang_admin.$phpEx" . ' couldn\'t be opened.'); ! } } ! ! /* ! if ((@include $module_root_path . "language/lang_" . $default_lang . "/lang_main.$phpEx") === false) { ! if ((@include $module_root_path . "language/lang_english/lang_main.$phpEx") === false) ! { ! mx_message_die(CRITICAL_ERROR, 'Language file ' . $module_root_path . "language/lang_" . $default_lang . "/lang_main.$phpEx" . ' couldn\'t be opened.'); ! } } + */ + $mx_user->extend(MX_LANG_MAIN, MX_IMAGES_NONE); // // Common definitions... // $cfg_chatname = $board_config['sitename'] . ' -> ' . 'Pjirc'; *************** *** 81,85 **** if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, "Couldn't query pjirc config table", "", __LINE__, __FILE__, $sql); } else --- 84,88 ---- if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't query pjirc config table", "", __LINE__, __FILE__, $sql); } else |
|
From: OryNider <ory...@us...> - 2008-02-09 09:45:46
|
Update of /cvsroot/mxbb/mx_pjirc/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32242 Modified Files: Tag: core28x lang_admin.php lang_faq.php lang_main.php Log Message: mxBB -> Mx-Publisher Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/language/lang_english/lang_main.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** lang_main.php 7 Jun 2007 00:10:30 -0000 1.1 --- lang_main.php 9 Feb 2008 09:45:42 -0000 1.1.2.1 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 [Florin Bodin] mxBB Development Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 [Florin Bodin] mxBB Development Team Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/language/lang_english/lang_admin.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** lang_admin.php 10 Jul 2007 02:40:36 -0000 1.2 --- lang_admin.php 9 Feb 2008 09:45:42 -0000 1.2.2.1 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 [Florin Bodin] mxBB Development Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 [Florin Bodin] mxBB Development Team Index: lang_faq.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/language/lang_english/lang_faq.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** lang_faq.php 7 Jun 2007 00:10:29 -0000 1.1 --- lang_faq.php 9 Feb 2008 09:45:42 -0000 1.1.2.1 *************** *** 2,6 **** /** * ! * @package mxBB Portal Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 [Florin Bodin] mxBB Development Team --- 2,6 ---- /** * ! * @package Mx-Publisher Module - mx_pjirc * @version $Id$ * @copyright (c) 2003-2006 [Florin Bodin] mxBB Development Team |
2 messages has been excluded from this view by a project administrator.
