Menu
▾
▴
[mxbb-commits] core/includes mx_functions_admincp.php,1.15,1.16 mx_functions_core.php,1.21,1.22 mx_functions_phpbb.php,1.16,1.17
|
From: Jon O. <jon...@us...> - 2005-12-17 00:31:55
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14206/includes Modified Files: mx_functions_admincp.php mx_functions_core.php mx_functions_phpbb.php Log Message: lots of updates, all covered in http://www.mx-system.com/forum/viewtopic.php?t=7945 Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** mx_functions_core.php 14 Dec 2005 13:49:08 -0000 1.21 --- mx_functions_core.php 17 Dec 2005 00:31:43 -0000 1.22 *************** *** 91,95 **** } ! if ( file_exists( $this->cache_dir . 'mx_config.' . $phpEx ) ) { foreach ( $this->vars_ts as $varname => $timestamp ) --- 91,95 ---- } ! if ( file_exists( $this->cache_dir . 'mx_config.' . $phpEx ) && is_array($this->vars_ts) ) { foreach ( $this->vars_ts as $varname => $timestamp ) *************** *** 497,501 **** $sql = "SELECT blk.*, sys.parameter_id, sys.parameter_value, sys.parameter_opt, ! par.parameter_name, par.parameter_type, par.parameter_function, par.parameter_default, par.parameter_order, mdl.module_path, fnc.function_file, fnc.function_id, fnc.function_admin --- 497,501 ---- $sql = "SELECT blk.*, sys.parameter_id, sys.parameter_value, sys.parameter_opt, ! par.parameter_name, par.parameter_type, par.parameter_auth, par.parameter_function, par.parameter_default, par.parameter_order, mdl.module_path, fnc.function_file, fnc.function_id, fnc.function_admin *************** *** 552,555 **** --- 552,556 ---- "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'], *************** *** 1434,1438 **** function load_block_parameters( $block_id = false ) { ! global $mx_root_path, $template, $blockcptemplate, $board_config, $theme; $return = false; --- 1435,1439 ---- function load_block_parameters( $block_id = false ) { ! global $mx_root_path, $template, $blockcptemplate, $board_config, $theme, $userdata; $return = false; *************** *** 1443,1510 **** foreach( $this->block_parameters as $parameter_name => $parameter_data ) { ! ob_start(); ! $this->is_panel = false; ! $template = new mx_Template($mx_root_path . $this->module_root_path . 'templates/subSilver', $board_config); ! ! switch ( $parameter_data['parameter_type'] ) { ! case 'Separator': ! $this->display_edit_Separator( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Text': ! $this->display_edit_PlainTextField( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'TextArea': ! $this->display_edit_PlainTextAreaField( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'BBText': ! $this->display_edit_BBText( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Html': ! $this->display_edit_Html( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Boolean': ! $this->display_edit_Boolean( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Number': ! $this->display_edit_Number( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Function': ! $this->display_edit_Function( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! ! // Custom Fields ! case 'Radio_single_select': ! $this->display_edit_Radio_single_select( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Menu_single_select': ! $this->display_edit_Menu_single_select( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Menu_multiple_select': ! $this->display_edit_Menu_multiple_select( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Checkbox_multiple_select': ! $this->display_edit_Checkbox_multiple_select( $block_id, $parameter_data['parameter_id'], $parameter_data ); break; ! default: ! $this->is_panel = $this->_get_custom_module_parameters($parameter_data, $block_id); ! break; ! } ! ! $block_output_data = ob_get_contents(); ! ob_end_clean(); ! ! if ($this->is_panel) ! { ! $blockcptemplate->assign_block_vars('blockcp_panel', array( ! 'BLOCKCP_PANELS' => ( !empty($block_output_data) ) ? $block_output_data : '' ! )); ! } ! else ! { ! $block_parameter_data .= $block_output_data; } - - $return = true; } --- 1444,1517 ---- foreach( $this->block_parameters as $parameter_name => $parameter_data ) { ! // ! // Switch for admin only parameters ! // ! if ($parameter_data['parameter_auth'] == 0 || $userdata['user_level'] == ADMIN) { ! ob_start(); ! $this->is_panel = false; ! $template = new mx_Template($mx_root_path . $this->module_root_path . 'templates/subSilver', $board_config); ! ! switch ( $parameter_data['parameter_type'] ) ! { ! case 'Separator': ! $this->display_edit_Separator( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Text': ! $this->display_edit_PlainTextField( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'TextArea': ! $this->display_edit_PlainTextAreaField( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'BBText': ! $this->display_edit_BBText( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Html': ! $this->display_edit_Html( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Boolean': ! $this->display_edit_Boolean( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Number': ! $this->display_edit_Number( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Function': ! $this->display_edit_Function( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! ! // Custom Fields ! case 'Radio_single_select': ! $this->display_edit_Radio_single_select( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Menu_single_select': ! $this->display_edit_Menu_single_select( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Menu_multiple_select': ! $this->display_edit_Menu_multiple_select( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Checkbox_multiple_select': ! $this->display_edit_Checkbox_multiple_select( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! default: ! $this->is_panel = $this->_get_custom_module_parameters($parameter_data, $block_id); break; ! } ! ! $block_output_data = ob_get_contents(); ! ob_end_clean(); ! ! if ($this->is_panel) ! { ! $blockcptemplate->assign_block_vars('blockcp_panel', array( ! 'BLOCKCP_PANELS' => ( !empty($block_output_data) ) ? $block_output_data : '' ! )); ! } ! else ! { ! $block_parameter_data .= $block_output_data; ! } ! ! $return = true; } } Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** mx_functions_phpbb.php 8 Dec 2005 14:41:48 -0000 1.16 --- mx_functions_phpbb.php 17 Dec 2005 00:31:43 -0000 1.17 *************** *** 283,287 **** global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header, $images, $mx_root_path; global $userdata, $user_ip, $session_length; ! global $mx_starttime; if(defined('HAS_DIED')) --- 283,287 ---- global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header, $images, $mx_root_path; global $userdata, $user_ip, $session_length; ! global $mx_starttime, $mx_page; if(defined('HAS_DIED')) *************** *** 292,296 **** define('HAS_DIED', 1); - $sql_store = $sql; --- 292,295 ---- *************** *** 337,347 **** --- 336,350 ---- { include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx); + include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx); } else { include($mx_root_path . 'language/lang_english/lang_main.'.$phpEx); + include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx); } } + $mx_page->page_title = $lang['Information']; + if ( empty($template) ) { *************** *** 412,415 **** --- 415,420 ---- break; } + + // Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mx_functions_admincp.php 11 Dec 2005 16:13:39 -0000 1.15 --- mx_functions_admincp.php 17 Dec 2005 00:31:43 -0000 1.16 *************** *** 204,207 **** --- 204,208 ---- $parameter_name = $mx_request_vars->post('parameter_name', MX_TYPE_NO_TAGS, ''); $parameter_type = $mx_request_vars->post('parameter_type', MX_TYPE_NO_TAGS, ''); + $parameter_auth = $mx_request_vars->post('parameter_auth', MX_TYPE_INT, '0'); $parameter_default = $mx_request_vars->post('parameter_default', MX_TYPE_POST_VARS, ''); $data = $mx_request_vars->post('parameter_function', MX_TYPE_POST_VARS, ''); *************** *** 243,250 **** // Insert New Parameter // ! $sql = "INSERT INTO " . PARAMETER_TABLE . " (function_id, parameter_name, parameter_type, parameter_default, parameter_function) VALUES( " . $function_id . ", '" . str_replace("\'", "''", $parameter_name) . "', '" . str_replace("\'", "''", $parameter_type) . "', '" . str_replace("\'", "''", $parameter_default) . "', '" . str_replace("\'", "''", $data) . "' )"; --- 244,252 ---- // Insert New Parameter // ! $sql = "INSERT INTO " . PARAMETER_TABLE . " (function_id, parameter_name, parameter_type, parameter_auth, parameter_default, parameter_function) VALUES( " . $function_id . ", '" . str_replace("\'", "''", $parameter_name) . "', '" . str_replace("\'", "''", $parameter_type) . "', + '" . str_replace("\'", "''", $parameter_auth) . "', '" . str_replace("\'", "''", $parameter_default) . "', '" . str_replace("\'", "''", $data) . "' )"; *************** *** 494,497 **** --- 496,500 ---- $block_id = $mx_request_vars->post('block_id', MX_TYPE_INT, 0); + echo('a'.$column_id.' '.$block_id); $sql = "SELECT MAX(block_order) AS max_order FROM " . COLUMN_BLOCK_TABLE . " WHERE column_id = '" . $column_id . "'"; if( !($result = $db->sql_query($sql)) ) *************** *** 503,507 **** $max_order = $row['max_order']; $next_order = intval($max_order + 10); - $sql = "INSERT INTO " . COLUMN_BLOCK_TABLE . " (column_id, block_id, block_order) --- 506,509 ---- *************** *** 692,695 **** --- 694,698 ---- $parameter_name = $mx_request_vars->post('parameter_name', MX_TYPE_NO_TAGS, ''); $parameter_type = $mx_request_vars->post('parameter_type', MX_TYPE_NO_TAGS, ''); + $parameter_auth = $mx_request_vars->post('parameter_auth', MX_TYPE_INT, '0'); $parameter_default = $mx_request_vars->post('parameter_default', MX_TYPE_POST_VARS, ''); $data = $mx_request_vars->post('parameter_function', MX_TYPE_POST_VARS, ''); *************** *** 735,738 **** --- 738,742 ---- SET parameter_name = '" . str_replace("\'", "''", $parameter_name) . "', parameter_type = '" . str_replace("\'", "''", $parameter_type) . "', + parameter_auth = '" . str_replace("\'", "''", $parameter_auth) . "', parameter_default = '" . str_replace("\'", "''", $parameter_default) . "', parameter_function = '" . str_replace("\'", "''", $data) . "' |
