Menu
▾
▴
[mxbb-commits] core/includes mx_constants.php, 1.20, 1.21 mx_functions.php, 1.67, 1.68 mx_functions_admincp.php, 1.21, 1.22 mx_functions_blockcp.php, 1.12, 1.13 mx_functions_core.php, 1.30, 1.31 mx_functions_phpbb.php, 1.23, 1.24 mx_functions_style.php, 1.4, 1.5 mx_functions_tools.php, 1.1, 1.2 page_header.php, 1.36, 1.37 page_tail.php, 1.24, 1.25
|
From: Jon O. <jon...@us...> - 2006-06-17 20:09:12
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20300/includes Modified Files: mx_constants.php mx_functions.php mx_functions_admincp.php mx_functions_blockcp.php mx_functions_core.php mx_functions_phpbb.php mx_functions_style.php mx_functions_tools.php page_header.php page_tail.php Log Message: Clean up... Index: page_tail.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** page_tail.php 2 May 2006 23:22:16 -0000 1.24 --- page_tail.php 17 Jun 2006 20:09:07 -0000 1.25 *************** *** 127,130 **** } exit; - ?> \ No newline at end of file --- 127,129 ---- Index: mx_functions_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mx_functions_blockcp.php 2 May 2006 23:22:16 -0000 1.12 --- mx_functions_blockcp.php 17 Jun 2006 20:09:07 -0000 1.13 *************** *** 183,187 **** // JS // - $cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_mode'; $cookie_blockCP = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : 'settings'; --- 183,186 ---- Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** mx_functions_core.php 29 May 2006 15:37:04 -0000 1.30 --- mx_functions_core.php 17 Jun 2006 20:09:07 -0000 1.31 *************** *** 84,87 **** --- 84,88 ---- $db->sql_freeresult($result); $this->put('phpbb_config', $config); + return ( $config ); } *************** *** 120,123 **** --- 121,125 ---- $db->sql_freeresult( $result ); $this->put('mxbb_config', $config); + return ( $config ); } *************** *** 230,250 **** $block_row = array( ! "block_id" => $row['block_id'], ! "block_title" => $row['block_title'], ! "block_desc" => $row['block_desc'], ! "auth_view" => $row['auth_view'], ! "auth_view_group" => $row['auth_view_group'], ! "auth_edit" => $row['auth_edit'], ! "auth_edit_group" => $row['auth_edit_group'], ! "auth_moderator_group" => $row['auth_moderator_group'], ! "show_block" => $row['show_block'], ! "show_title" => $row['show_title'], ! "show_stats" => $row['show_stats'], ! "block_time" => $row['block_time'], ! "block_editor_id" => $row['block_editor_id'], ! "module_root_path" => $row['module_path'], ! "block_file" => $row['function_file'], ! "block_edit_file" => $row['function_admin'], ! "function_id" => $row['function_id'] ); --- 232,252 ---- $block_row = array( ! "block_id" => $row['block_id'], ! "block_title" => $row['block_title'], ! "block_desc" => $row['block_desc'], ! "auth_view" => $row['auth_view'], ! "auth_view_group" => $row['auth_view_group'], ! "auth_edit" => $row['auth_edit'], ! "auth_edit_group" => $row['auth_edit_group'], ! "auth_moderator_group" => $row['auth_moderator_group'], ! "show_block" => $row['show_block'], ! "show_title" => $row['show_title'], ! "show_stats" => $row['show_stats'], ! "block_time" => $row['block_time'], ! "block_editor_id" => $row['block_editor_id'], ! "module_root_path" => $row['module_path'], ! "block_file" => $row['function_file'], ! "block_edit_file" => $row['function_admin'], ! "function_id" => $row['function_id'] ); *************** *** 288,321 **** $block_row = array( ! "block_id" => $row['block_id'], ! "block_title" => $row['block_title'], ! "block_desc" => $row['block_desc'], ! "column_id" => $row['column_id'], ! "auth_view" => $row['auth_view'], ! "auth_view_group" => $row['auth_view_group'], ! "auth_edit" => $row['auth_edit'], ! "auth_edit_group" => $row['auth_edit_group'], ! "auth_moderator_group" => $row['auth_moderator_group'], ! "show_block" => $row['show_block'], ! "show_title" => $row['show_title'], ! "show_stats" => $row['show_stats'], ! "block_time" => $row['block_time'], ! "block_editor_id" => $row['block_editor_id'], ! "module_root_path" => $row['module_path'], ! "block_file" => $row['function_file'], ! "block_edit_file" => $row['function_admin'], ! "function_id" => $row['function_id'] ); $param_row = array( ! "parameter_id" => $row['parameter_id'], ! "function_id" => $row['function_id'], ! "parameter_name" => $row['parameter_name'], ! "parameter_type" => $row['parameter_type'], ! "parameter_auth" => $row['parameter_auth'], ! "parameter_value" => $row['parameter_value'], ! "parameter_default" => $row['parameter_default'], ! "parameter_function" => $row['parameter_function'], ! "parameter_opt" => $row['parameter_opt'] ); --- 290,323 ---- $block_row = array( ! "block_id" => $row['block_id'], ! "block_title" => $row['block_title'], ! "block_desc" => $row['block_desc'], ! "column_id" => $row['column_id'], ! "auth_view" => $row['auth_view'], ! "auth_view_group" => $row['auth_view_group'], ! "auth_edit" => $row['auth_edit'], ! "auth_edit_group" => $row['auth_edit_group'], ! "auth_moderator_group" => $row['auth_moderator_group'], ! "show_block" => $row['show_block'], ! "show_title" => $row['show_title'], ! "show_stats" => $row['show_stats'], ! "block_time" => $row['block_time'], ! "block_editor_id" => $row['block_editor_id'], ! "module_root_path" => $row['module_path'], ! "block_file" => $row['function_file'], ! "block_edit_file" => $row['function_admin'], ! "function_id" => $row['function_id'] ); $param_row = array( ! "parameter_id" => $row['parameter_id'], ! "function_id" => $row['function_id'], ! "parameter_name" => $row['parameter_name'], ! "parameter_type" => $row['parameter_type'], ! "parameter_auth" => $row['parameter_auth'], ! "parameter_value" => $row['parameter_value'], ! "parameter_default" => $row['parameter_default'], ! "parameter_function" => $row['parameter_function'], ! "parameter_opt" => $row['parameter_opt'] ); Index: mx_constants.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_constants.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mx_constants.php 3 May 2006 09:17:28 -0000 1.20 --- mx_constants.php 17 Jun 2006 20:09:06 -0000 1.21 *************** *** 37,40 **** --- 37,41 ---- */ define('PORTAL_TABLE', $mx_table_prefix . 'portal'); + define('MENU_NAV_TABLE', $mx_table_prefix . 'menu_nav'); define('MENU_CAT_TABLE', $mx_table_prefix . 'menu_categories'); Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mx_functions_phpbb.php 3 May 2006 10:02:22 -0000 1.23 --- mx_functions_phpbb.php 17 Jun 2006 20:09:07 -0000 1.24 *************** *** 267,273 **** else { ! $template->set_filenames(array( ! 'message_body' => 'admin/admin_message_body.tpl') ! ); } --- 267,271 ---- else { ! $template->set_filenames(array( 'message_body' => 'admin/admin_message_body.tpl') ); } Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_functions_tools.php 3 May 2006 10:02:22 -0000 1.1 --- mx_functions_tools.php 17 Jun 2006 20:09:07 -0000 1.2 *************** *** 697,699 **** --- 697,716 ---- } } + + class mx_post + { + function decode($text, $bbcode_uid = '', $html_on = false, $bbcode_on = true, $smilies_on = false, $links_on = true, $images_on = true) + { + global $board_config; + + return $text; + } + + function encode($text, $bbcode_uid = '', $html_on = false, $bbcode_on = true, $smilies_on = false, $links_on = true, $images_on = true) + { + global $board_config; + + return $text; + } + } ?> \ No newline at end of file Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** page_header.php 29 May 2006 15:37:04 -0000 1.36 --- page_header.php 17 Jun 2006 20:09:07 -0000 1.37 *************** *** 61,65 **** // If mxBB frame template is not set, instantiate it // ! if (!is_object($layouttemplate)) { // --- 61,65 ---- // If mxBB frame template is not set, instantiate it // ! if ( is_object($layouttemplate) == FALSE ) { // *************** *** 191,195 **** --- 191,197 ---- } + // // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility + // $l_timezone = explode( '.', $board_config['board_timezone'] ); $l_timezone = ( count( $l_timezone ) > 1 && $l_timezone[count( $l_timezone )-1] != 0 ) ? $lang[sprintf( '%.1f', $board_config['board_timezone'] )] : $lang[number_format( $board_config['board_timezone'] )]; Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_functions_style.php 29 May 2006 15:37:04 -0000 1.4 --- mx_functions_style.php 17 Jun 2006 20:09:07 -0000 1.5 *************** *** 18,22 **** // Including phpBB version of the Template class // ! include_once($phpbb_root_path . "includes/template.$phpEx"); /** --- 18,22 ---- // Including phpBB version of the Template class // ! include_once($phpbb_root_path . 'includes/template.' . $phpEx); /** *************** *** 68,72 **** --- 68,74 ---- if( file_exists($module_root_path . 'templates/' . $style_path . $filename) ) { + // // First check current template + // $filename = $module_root_path . 'templates/' . $style_path . $filename; $this->module_template_path = 'templates/' . $style_path; *************** *** 74,78 **** --- 76,82 ---- else if( file_exists($module_root_path . 'templates/subSilver/' . $filename) ) { + // // Then check subSilver + // $filename = $module_root_path . 'templates/subSilver/' . $filename; $this->module_template_path = 'templates/subSilver/'; *************** *** 80,84 **** --- 84,90 ---- else if( file_exists($module_root_path . 'templates/' . $filename) ) { + // // Finally check the tenmplate root (for compatibility with some old modules) + // $filename = $module_root_path . 'templates/' . $filename; $this->module_template_path = 'templates/'; *************** *** 90,99 **** --- 96,109 ---- else if( file_exists($mx_root_path . 'templates/' . $style_path . $filename) ) { + // // First check current template + // $filename = $mx_root_path . 'templates/' . $style_path . $filename; } else if( file_exists($mx_root_path . 'templates/subSilver/' . $filename) ) { + // // Then check subSilver + // $filename = $mx_root_path . 'templates/subSilver/' . $filename; } *************** *** 101,105 **** --- 111,117 ---- else if( file_exists($mx_root_path . 'templates/' . $filename) ) { + // // Finally check the template root + // $filename = $mx_root_path . 'templates/' . $filename; } *************** *** 116,125 **** --- 128,141 ---- if( file_exists($phpbb_root_path . 'templates/' . $style_path . $filename) ) { + // // First check current template + // $filename = $phpbb_root_path . 'templates/' . $style_path . $filename; } else if( file_exists($phpbb_root_path . 'templates/subSilver/' . $filename) ) { + // // Then check subSilver + // $filename = $phpbb_root_path . 'templates/subSilver/' . $filename; } *************** *** 130,134 **** --- 146,152 ---- else if( file_exists($this->root . '/' . $filename) ) { + // // Check if it's an absolute or relative path. + // if( substr($filename, 0, 1) != '/' ) { *************** *** 225,229 **** $userdata = session_pagestart($user_ip, - ( 1000 + $page_id )); // Use native phpBB 2.0.x session handling $this->is_admin = $userdata['user_level'] == ADMIN && $userdata['session_logged_in']; - } --- 243,246 ---- *************** *** 263,267 **** // Is the lang installed? // ! if ( !file_exists($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) || !file_exists($pbpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx)) { $board_config['default_lang'] = 'english'; --- 280,284 ---- // Is the lang installed? // ! if ( !file_exists($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) || !file_exists($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx)) { $board_config['default_lang'] = 'english'; *************** *** 474,478 **** // Is this a cloned temmplate - defined by main *.cfg? // - $template_config_row['cloned_template'] = trim(htmlspecialchars($mx_template_settings['cloned_template'])); $template_config_row['border_graphics'] = $mx_template_settings['border_graphics']; --- 491,494 ---- Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** mx_functions_admincp.php 3 May 2006 09:17:28 -0000 1.21 --- mx_functions_admincp.php 17 Jun 2006 20:09:06 -0000 1.22 *************** *** 135,139 **** // // No update needed ;) - $message['text'] = $lang['AdminCP_action'] . ": " . $lang['Module'] . ' (' . $mx_request_vars->post('module_name', MX_TYPE_NO_TAGS, 'error - no name given') . ') ' . $lang['was_inserted']; $message['new_module_id'] = $module_id_new; --- 135,138 ---- *************** *** 240,244 **** // This function also updates the cache // - $message_tmp = $this->update_block_parameter_data($function_id); $message_tmp = !empty($message_tmp) ? '<br /><br />' . $message_tmp : ''; --- 239,242 ---- *************** *** 320,323 **** --- 318,322 ---- $message['text'] = $lang['AdminCP_action'] . ": " . $lang['Block'] . ' (' . $mx_request_vars->post('block_title', MX_TYPE_NO_TAGS, 'error - no name given') . ') ' . $lang['was_inserted']; $message['new_id'] = $next_id; + break; *************** *** 3809,3811 **** --- 3808,3832 ---- return $message; } + + /** + * Enter description here... + * + * @param unknown_type $default + * @param unknown_type $select_name + * @return unknown + */ + function mx_generate_meta_select($default, $select_name) + { + global $lang; + + $select = '<select name="' . $select_name . '">'; + foreach( $lang['mx_meta'][$select_name] as $key => $value ) + { + $selected = ( $key == $default ) ? ' selected="selected"' : ''; + $select .= '<option value="' . $key . '"' . $selected . '>' . $value . "</option>\n"; + } + $select .= '</select>'; + + return $select; + } ?> \ No newline at end of file Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** mx_functions.php 29 May 2006 15:37:03 -0000 1.67 --- mx_functions.php 17 Jun 2006 20:09:06 -0000 1.68 *************** *** 490,503 **** $url .= implode('&', $url_array); ! /* for ($j = 0; $j < count($url_array); $j++) ! { ! if( $j < count($url_array) -1 ) ! { ! $url .= $url_array[$j] . "&" ; ! } ! else { ! $url .= $url_array[$j]; ! } } */ --- 490,504 ---- $url .= implode('&', $url_array); ! /* ! for ($j = 0; $j < count($url_array); $j++) { ! if( $j < count($url_array) -1 ) ! { ! $url .= $url_array[$j] . "&" ; ! } ! else ! { ! $url .= $url_array[$j]; ! } } */ |
