Menu
▾
▴
[mxbb-commits] core/modules/mx_coreblocks CoreBlocks.pak,1.6,1.7 mx_language.php,1.10,1.11 mx_online.php,1.8,1.9 mx_theme.php,1.10,1.11
|
From: Jon O. <jon...@us...> - 2005-09-20 15:31:13
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15865/modules/mx_coreblocks Modified Files: CoreBlocks.pak mx_language.php mx_online.php mx_theme.php Log Message: adding fixes for mxBB 2.8 RC 6 Index: mx_language.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_language.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mx_language.php 6 Sep 2005 18:51:57 -0000 1.10 --- mx_language.php 20 Sep 2005 15:30:58 -0000 1.11 *************** *** 25,36 **** } ! $language = $mx_request_vars->post('change_default_lang', MX_TYPE_NO_TAGS, ''); ! $language = ( preg_match('#^[a-z_]+$#', $language) ? strip_tags($language) : '' ); ! if ( !empty($language) && $userdata['user_level'] == ADMIN ) { ! $board_config['default_lang'] = $language; $sql = "UPDATE " . CONFIG_TABLE . " SET ! config_value = '$language' WHERE config_name = 'default_lang'"; if ( !$db->sql_query($sql) ) --- 25,38 ---- } ! // ! // 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; $sql = "UPDATE " . CONFIG_TABLE . " SET ! config_value = '$mx_language' WHERE config_name = 'default_lang'"; if ( !$db->sql_query($sql) ) *************** *** 38,51 **** mx_message_die(GENERAL_ERROR, "Failed to update default language configuration", '', __LINE__, __FILE__, $sql); } } ! $language = $mx_request_vars->post('change_user_lang', MX_TYPE_NO_TAGS, ''); ! $language = ( preg_match('#^[a-z_]+$#', $language) ? strip_tags($language) : '' ); ! if ( !empty($language) && $userdata['session_logged_in'] ) { ! $userdata['user_lang'] = $language; $sql = "UPDATE " . USERS_TABLE . " SET ! user_lang = '$language' WHERE user_id = '" . $userdata['user_id'] . "'"; if ( !$db->sql_query($sql) ) --- 40,53 ---- mx_message_die(GENERAL_ERROR, "Failed to update default language configuration", '', __LINE__, __FILE__, $sql); } + setcookie('default_lang', $mx_language, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); } ! 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; $sql = "UPDATE " . USERS_TABLE . " SET ! user_lang = '$mx_language' WHERE user_id = '" . $userdata['user_id'] . "'"; if ( !$db->sql_query($sql) ) Index: CoreBlocks.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/CoreBlocks.pak,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CoreBlocks.pak 7 Sep 2005 19:36:30 -0000 1.6 --- CoreBlocks.pak 20 Sep 2005 15:30:58 -0000 1.7 *************** *** 1,73 **** ! module=+:10=+:Core Blocks=+:modules/mx_coreblocks/=+:mxBB Core (standard) Module=+:0 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:2=+:Announcements=+:Announcements Function=+:mx_announce.php=+: ! parameter=+:2=+:3=+:announce_display=+:Boolean=+:TRUE=+: ! parameter=+:2=+:6=+:announce_display_global=+:Boolean=+:TRUE=+: ! parameter=+:2=+:5=+:announce_display_normal=+:Boolean=+:FALSE=+: ! parameter=+:2=+:4=+:announce_display_sticky=+:Boolean=+:TRUE=+: ! parameter=+:2=+:11=+:announce_forum=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE) ! parameter=+:2=+:7=+:announce_img=+:Text=+:thumb_globe.gif=+: ! parameter=+:2=+:10=+:announce_img_global=+:Text=+:thumb_globe.gif=+: ! parameter=+:2=+:9=+:announce_img_normal=+:Text=+:thumb_globe.gif=+: ! parameter=+:2=+:8=+:announce_img_sticky=+:Text=+:thumb_globe.gif=+: ! parameter=+:2=+:2=+:announce_nbr_days=+:Number=+:14=+: ! parameter=+:2=+:1=+:announce_nbr_display=+:Number=+:1=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Announcements=+:Demo block=+:2=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:3=+:DynamicBlock=+:Dynamic block defined by its block_id=+:mx_dynamic.php=+: ! parameter=+:3=+:80=+:default_block_id=+:Function=+:0=+:get_list_formatted("block_list","{parameter_value}","{parameter_id}[]") parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - DynamicBlock=+:Demo block=+:3=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:8=+:phpBB forum=+:phpBB Function for the phpBB Index Block=+:mx_forum.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - phpBB forum=+:Demo block=+:8=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:4=+:Google=+:Google Block Function=+:mx_google.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Google=+:Demo block=+:4=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:5=+:IncludeX=+:Include a iframe, site, multimedia or file=+:mx_includex.php=+: ! parameter=+:5=+:72=+:x_1=+:Text=+:=+: ! parameter=+:5=+:73=+:x_2=+:Text=+:=+: ! parameter=+:5=+:71=+:x_3=+:Text=+:http://www.mx-system.com=+: ! parameter=+:5=+:70=+: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";} parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - IncludeX=+:Demo block=+:5=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:6=+:Language Select=+:Language Select Function=+:mx_language.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Language Select=+:Demo block=+:6=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:7=+:Login=+:Login Function=+:mx_login.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Login=+:Demo block=+:7=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:11=+:Split Block=+:Split Block Function - a block that puts subblocks side by side=+:mx_multiple_blocks.php=+: ! parameter=+:11=+:60=+:block_ids=+:Function=+:1,2,3=+:get_list_multiple( "{parameter_id}[]", BLOCK_TABLE, 'block_id', 'block_title', "{parameter_value}", TRUE) ! parameter=+:11=+:61=+:block_sizes=+:Text=+:20%,30%,*=+: ! parameter=+:11=+:62=+:space_between=+:Number=+:4=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Split Block=+:Demo block=+:11=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:13=+:Who is Online=+:Who is Online Function=+:mx_online.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Who is Online=+:Demo block=+:13=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:14=+:Polls=+:This is the function for Polls=+:mx_poll.php=+: ! parameter=+:14=+:13=+:Poll_Display=+:Function=+:0=+:poll_select( {parameter_value}, "{parameter_id}" ) ! parameter=+:14=+:36=+:poll_forum=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE) parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Polls=+:Demo block=+:14=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:10=+:Site Log=+:Site Log monitor Function=+:mx_site_log.php=+: ! parameter=+:10=+:91=+: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";} ! parameter=+:10=+:92=+:numOfEvents=+:Number=+:5=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Site Log=+:Demo block=+:10=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:12=+:Theme Select=+:Theme Select Function=+:mx_theme.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Theme Select=+:Demo block=+:12=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 1,73 ---- ! module=+:10=+:Core Blocks=+:modules/mx_coreblocks/=+:Core blocks=+: New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:17=+:Announcements=+:Announcements=+:mx_announce.php=+: ! parameter=+:17=+:3=+:announce_display=+:Boolean=+:TRUE=+: ! parameter=+:17=+:6=+:announce_display_global=+:Boolean=+:TRUE=+: ! parameter=+:17=+:5=+:announce_display_normal=+:Boolean=+:FALSE=+: ! parameter=+:17=+:4=+:announce_display_sticky=+:Boolean=+:TRUE=+: ! parameter=+:17=+:11=+:announce_forum=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE) ! parameter=+:17=+:7=+:announce_img=+:Text=+:thumb_globe.gif=+: ! parameter=+:17=+:10=+:announce_img_global=+:Text=+:thumb_globe.gif=+: ! parameter=+:17=+:9=+:announce_img_normal=+:Text=+:thumb_globe.gif=+: ! parameter=+:17=+:8=+:announce_img_sticky=+:Text=+:thumb_globe.gif=+: ! parameter=+:17=+:2=+:announce_nbr_days=+:Number=+:14=+: ! parameter=+:17=+:1=+:announce_nbr_display=+:Number=+:1=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Announcements=+:Demo block=+:17=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:53=+:DynamicBlock=+:Dynamic block defined by its block_id=+:mx_dynamic.php=+: ! parameter=+:53=+:136=+:default_block_id=+:Function=+:0=+:get_list_formatted("block_list","{parameter_value}","{parameter_id}[]") parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - DynamicBlock=+:Demo block=+:53=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:10=+:Forum phpBB=+:Forum phpBB=+:mx_forum.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Forum phpBB=+:Demo block=+:10=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:16=+:Google=+:Google=+:mx_google.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Google=+:Demo block=+:16=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:48=+:IncludeX=+:Include site or file=+:mx_includex.php=+: ! parameter=+:48=+:133=+:x_1=+:Text=+:=+: ! parameter=+:48=+:134=+:x_2=+:Text=+:=+: ! parameter=+:48=+:161=+:x_3=+:Text=+:http://www.mx-system.com=+: ! parameter=+:48=+:131=+: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";} parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - IncludeX=+:Demo block=+:48=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:13=+:Language Select=+:Language Select=+:mx_language.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Language Select=+:Demo block=+:13=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:14=+:Login=+:Login=+:mx_login.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Login=+:Demo block=+:14=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:19=+:Multiple Horizontal Blocks=+:Block that can arrange other blocks in a horizontal line.=+:mx_multiple_blocks.php=+: ! parameter=+:19=+:60=+:block_ids=+:Function=+:1,2,3=+:get_list_multiple( "{parameter_id}[]", BLOCK_TABLE, 'block_id', 'block_title', "{parameter_value}", TRUE) ! parameter=+:19=+:61=+:block_sizes=+:Text=+:20%,30%,*=+: ! parameter=+:19=+:62=+:space_between=+:Number=+:4=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Multiple Horizontal Blocks=+:Demo block=+:19=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:18=+:Who is Online=+:Who is Online=+:mx_online.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Who is Online=+:Demo block=+:18=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:12=+:Polls=+:Polls=+:mx_poll.php=+: ! parameter=+:12=+:13=+:Poll_Display=+:Function=+:0=+:poll_select( {parameter_value}, "{parameter_id}" ) ! parameter=+:12=+:36=+:poll_forum=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE) parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Polls=+:Demo block=+:12=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:97=+:Site Log=+:Site change monitor=+:mx_site_log.php=+: ! parameter=+:97=+:317=+: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";} ! parameter=+:97=+:315=+:numOfEvents=+:Number=+:5=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Site Log=+:Demo block=+:97=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:15=+:Theme Select=+:Theme Select=+:mx_theme.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Theme Select=+:Demo block=+:15=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 Index: mx_online.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_online.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mx_online.php 15 Apr 2005 18:34:51 -0000 1.8 --- mx_online.php 20 Sep 2005 15:30:58 -0000 1.9 *************** *** 41,46 **** //if (defined('SHOW_ONLINE')) { - - $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s --- 41,44 ---- Index: mx_theme.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_theme.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mx_theme.php 6 Sep 2005 18:51:57 -0000 1.10 --- mx_theme.php 20 Sep 2005 15:30:58 -0000 1.11 *************** *** 25,36 **** } ! $user_style = $mx_request_vars->post('change_default_theme', MX_TYPE_NO_TAGS, ''); ! $user_style = ( preg_match('#^[a-z_]+$#', $user_style) ? strip_tags($user_style) : '' ); ! if ( !empty($user_style) && $userdata['user_level'] == ADMIN ) { ! $board_config['default_style'] = $user_style; $sql = "UPDATE " . CONFIG_TABLE . " SET ! config_value = '$user_style' WHERE config_name = 'default_style'"; if ( !$db->sql_query($sql) ) --- 25,35 ---- } ! 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; $sql = "UPDATE " . CONFIG_TABLE . " SET ! config_value = '$mx_default_style' WHERE config_name = 'default_style'"; if ( !$db->sql_query($sql) ) *************** *** 38,51 **** mx_message_die(GENERAL_ERROR, "Failed to update default style configuration", '', __LINE__, __FILE__, $sql); } } ! $user_style = $mx_request_vars->post('change_user_theme', MX_TYPE_NO_TAGS, ''); ! $user_style = ( preg_match('#^[a-z_]+$#', $user_style) ? strip_tags($user_style) : '' ); ! if ( !empty($user_style) && $userdata['session_logged_in'] ) { ! $userdata['user_style'] = $user_style; $sql = "UPDATE " . USERS_TABLE . " SET ! user_style = '$user_style' WHERE user_id = '" . $userdata['user_id'] . "'"; if ( !$db->sql_query( $sql ) ) --- 37,50 ---- mx_message_die(GENERAL_ERROR, "Failed to update default style configuration", '', __LINE__, __FILE__, $sql); } + setcookie('default_style', $mx_default_style, (time()+21600), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); } ! 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; $sql = "UPDATE " . USERS_TABLE . " SET ! user_style = '$mx_user_style' WHERE user_id = '" . $userdata['user_id'] . "'"; if ( !$db->sql_query( $sql ) ) |
