Menu
▾
▴
[mxbb-commits] core/modules/mx_coreblocks mx_announce.php,1.14,1.15 mx_blockcp.php,1.1,1.2 mx_includex.php,1.4,1.5 mx_language.php,1.9,1.10 mx_login.php,1.6,1.7 mx_poll.php,1.20,1.21 mx_site_log.php,1.1,1.2 mx_theme.php,1.9,1.10
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4716/modules/mx_coreblocks Modified Files: mx_announce.php mx_blockcp.php mx_includex.php mx_language.php mx_login.php mx_poll.php mx_site_log.php mx_theme.php Log Message: Finalizing core 2.8 ;) Index: mx_poll.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_poll.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mx_poll.php 26 Apr 2005 00:15:03 -0000 1.20 --- mx_poll.php 6 Sep 2005 18:51:57 -0000 1.21 *************** *** 302,307 **** else { ! $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; } } --- 302,307 ---- else { ! $mx_block->show_title = false; ! $mx_block->show_block = false; } } Index: mx_login.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_login.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_login.php 19 Apr 2005 17:18:47 -0000 1.6 --- mx_login.php 6 Sep 2005 18:51:57 -0000 1.7 *************** *** 41,49 **** )); - // if( !$userdata['session_logged_in'] ) - // { $template->assign_block_vars('switch_user_logged_out', array()); $template->pparse('body_login'); - // } ?> \ No newline at end of file --- 41,46 ---- Index: mx_language.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_language.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mx_language.php 19 Apr 2005 18:02:26 -0000 1.9 --- mx_language.php 6 Sep 2005 18:51:57 -0000 1.10 *************** *** 92,97 **** else { ! $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; } --- 92,97 ---- else { ! $mx_block->show_title = false; ! $mx_block->show_block = false; } Index: mx_site_log.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_site_log.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_site_log.php 11 Feb 2005 22:05:56 -0000 1.1 --- mx_site_log.php 6 Sep 2005 18:51:57 -0000 1.2 *************** *** 29,46 **** // Read block Configuration ! $log_numberOfEvents = $block_config[$block_id][numOfEvents]['parameter_value'] > 0 ? intval( $block_config[$block_id][numOfEvents]['parameter_value']) : '5'; ! $log_filter_time = $block_config[$block_id][log_filter_date]['parameter_value']; // no limit, last day, 2 days, 3 days, week, 2 weeks, 3 weeks, month, 2 months, 3 months, 6 months, i year, ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); ! } ! else ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); ! } $log_start = ( isset( $HTTP_GET_VARS['log_start'] ) ) ? intval( $HTTP_GET_VARS['log_start'] ) : 0; --- 29,34 ---- // Read block Configuration ! $log_numberOfEvents = $block_config[$block_id]['numOfEvents']['parameter_value'] > 0 ? intval( $block_config[$block_id]['numOfEvents']['parameter_value']) : '5'; ! $log_filter_time = $block_config[$block_id]['log_filter_date']['parameter_value']; // no limit, last day, 2 days, 3 days, week, 2 weeks, 3 weeks, month, 2 months, 3 months, 6 months, i year, $log_start = ( isset( $HTTP_GET_VARS['log_start'] ) ) ? intval( $HTTP_GET_VARS['log_start'] ) : 0; *************** *** 79,116 **** switch ( $log_filter_time ) { ! case '0': $news_time_filter_lo = "no"; break; ! case '1': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 1), intval(substr($log_today, 4, 4)) ); break; ! case '2': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 1), intval(substr($log_today, 4, 4)) ); break; ! case '3': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 1), intval(substr($log_today, 4, 4)) ); break; ! case '4': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 7), intval(substr($log_today, 4, 4)) ); break; ! case '5': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 14), intval(substr($log_today, 4, 4)) ); break; ! case '6': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 21), intval(substr($log_today, 4, 4)) ); break; ! case '7': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 1), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '8': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 2), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '9': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 3), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '10': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 6), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '11': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4) - 1) ); break; --- 67,104 ---- switch ( $log_filter_time ) { ! case 'no limit': $news_time_filter_lo = "no"; break; ! case '1 day': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 1), intval(substr($log_today, 4, 4)) ); break; ! case '2 days': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 1), intval(substr($log_today, 4, 4)) ); break; ! case '3 days': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 1), intval(substr($log_today, 4, 4)) ); break; ! case '1 week': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 7), intval(substr($log_today, 4, 4)) ); break; ! case '2 weeks': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 14), intval(substr($log_today, 4, 4)) ); break; ! case '3 weeks': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 21), intval(substr($log_today, 4, 4)) ); break; ! case '1 month': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 1), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '2 months': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 2), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '3 months': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 3), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '6 months': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 6), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '1 year': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4) - 1) ); break; Index: mx_includex.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_includex.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_includex.php 19 Apr 2005 17:14:19 -0000 1.4 --- mx_includex.php 6 Sep 2005 18:51:57 -0000 1.5 *************** *** 98,103 **** default: // Hidden ! $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; return; } --- 98,103 ---- default: // Hidden ! $mx_block->show_title = false; ! $mx_block->show_block = false; return; } Index: mx_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_blockcp.php 20 Aug 2005 18:19:12 -0000 1.1 --- mx_blockcp.php 6 Sep 2005 18:51:57 -0000 1.2 *************** *** 30,33 **** --- 30,36 ---- include($mx_root_path . 'includes/mx_functions_admincp.' . $phpEx); + include_once($phpbb_root_path . 'includes/functions_search.'.$phpEx); // required for search tables + include_once($phpbb_root_path . "includes/functions_post.$phpEx"); // required by mx_generate_smilies + $view_page = false; *************** *** 35,39 **** // Start session management // ! $userdata = session_pagestart($user_ip, PAGE_INDEX); mx_init_userprefs($userdata); --- 38,42 ---- // Start session management // ! $userdata = session_pagestart($user_ip, '-999'); mx_init_userprefs($userdata); *************** *** 41,46 **** // End session management // - include_once($phpbb_root_path . 'includes/functions_search.'.$phpEx); // required for search tables - include_once($phpbb_root_path . "includes/functions_post.$phpEx"); // required by mx_generate_smilies // ********************************************************************** --- 44,47 ---- *************** *** 82,85 **** --- 83,91 ---- // + // Define blockcp mode: 'mx_blockcp' or 'admin_mx_block_cp' + // + $mx_blockcp->blockcp_mode = 'mx_blockcp'; + + // // Mode setting // *************** *** 101,104 **** --- 107,111 ---- // $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; *************** *** 136,150 **** // SUBMIT? // ! if( $submit && !empty($mode) && !empty($action) ) { // // Get vars // ! // ! // Send to adminCP ! // ! $result_message = $mx_blockcp->submit_parameters($block_id); ! $message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . append_sid($mx_root_path ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&portalpage=$portalpage&sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 143,171 ---- // SUBMIT? // ! if( ($submit || $submit_pars) && !empty($mode) && !empty($action) ) { // // Get vars // + $block_id = $mx_request_vars->request('id', MX_TYPE_INT, ''); + $dynamic_block_id = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, ''); ! if( $submit ) ! { ! // ! // Send to adminCP ! // ! $result_message = $mx_admin->do_it($mode, $action, $block_id); ! } ! ! if( $submit_pars ) ! { ! // ! // Send to BlockCP ! // ! $result_message = $mx_blockcp->submit_parameters($block_id); ! } ! ! $message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . append_sid($mx_root_path ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&portalpage=$portalpage&dynamic_block=$dynamic_block_id&sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage&dynamic_block=$dynamic_block_id") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); Index: mx_announce.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_announce.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mx_announce.php 28 Apr 2005 13:58:32 -0000 1.14 --- mx_announce.php 6 Sep 2005 18:51:57 -0000 1.15 *************** *** 133,138 **** if ( $total_posts == 0 ) { ! $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; return; } --- 133,138 ---- if ( $total_posts == 0 ) { ! $mx_block->show_title = false; ! $mx_block->show_block = false; return; } Index: mx_theme.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_theme.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mx_theme.php 19 Apr 2005 18:02:27 -0000 1.9 --- mx_theme.php 6 Sep 2005 18:51:57 -0000 1.10 *************** *** 92,97 **** else { ! $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; } --- 92,97 ---- else { ! $mx_block->show_title = false; ! $mx_block->show_block = false; } |
