Menu
▾
▴
[mxbb-commits] core/includes mx_functions_admincp.php,1.16,1.17 mx_functions_core.php,1.22,1.23
|
From: Jon O. <jon...@us...> - 2005-12-17 13:10:36
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20870/includes Modified Files: mx_functions_admincp.php mx_functions_core.php Log Message: further fixes for new parameter field - updated paks Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mx_functions_core.php 17 Dec 2005 00:31:43 -0000 1.22 --- mx_functions_core.php 17 Dec 2005 13:10:27 -0000 1.23 *************** *** 1292,1395 **** foreach( $this->block_parameters as $parameter_name => $parameter_data ) { - $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 = ''; - - switch ( $parameter_data['parameter_type'] ) - { - case 'Boolean': - case 'Text': - case 'TextArea': - $parameter_value = htmlspecialchars( trim( $parameter_value ) ); - break; - case 'BBText': - $bbcode_uid = $parameter_opt = make_bbcode_uid(); - $parameter_value = prepare_message($parameter_value, true, true, true, $bbcode_uid); - break; - case 'Html': - $parameter_value = prepare_message($parameter_value, true, false, false); - break; - case 'Number': - $parameter_value = intval($parameter_value); - break; - case 'Function': - if( is_array($parameter_value) ) - { - //$parameter_value = implode(',' , htmlspecialchars($parameter_value)); - $parameter_value = implode(',' , $parameter_value); - } - break; - - // Custom Fields - case 'Radio_single_select': - case 'Menu_single_select': - $parameter_value = htmlspecialchars( trim( $parameter_value ) ); - break; - case 'Menu_multiple_select': - case 'Checkbox_multiple_select': - $parameter_value = addslashes( serialize( $parameter_value ) ); - break; - case 'Separator': - break; - - default: - $parameter_custom = $this->_submit_custom_module_parameters($parameter_data, $block_id); - $parameter_value = $parameter_custom['parameter_value']; - $parameter_opt = $parameter_custom['parameter_opt']; - break; - } - // ! // Update block data // ! if ( $sub_id == $parameter_data['sub_id'] || true ) ! { ! // ! // If standard block // ! $sql = "UPDATE " . BLOCK_SYSTEM_PARAMETER_TABLE . " ! SET parameter_value = '" . str_replace("\'", "''", $parameter_value) . "', ! parameter_opt = '$parameter_opt' ! WHERE block_id = '$block_id' ! AND parameter_id = '$parameter_id' ! AND sub_id = '$sub_id'"; ! } ! else ! { ! /* // ! // If subblock ! // ! $sql = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . "(block_id, parameter_id, parameter_value, parameter_opt, sub_id) ! VALUES('$block_id','$parameter_id','" . str_replace("\'", "''", $parameter_value) . "','$parameter_opt', '$sub_id')"; ! */ ! } ! ! if( !($db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, "Couldn't update system parameter table", "", __LINE__, __FILE__, $sql); ! } ! ! // ! // Update block itself ! // ! if( $sub_id == 0 ) ! { ! $block_time = time(); ! $block_editor_id = $userdata['user_id']; ! ! $sql = "UPDATE " . BLOCK_TABLE . " ! SET block_time = '" . str_replace("\'", "''", $block_time) . "', ! block_editor_id = '" . intval($block_editor_id) . "' ! WHERE block_id = $block_id"; ! ! if( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) ) { ! mx_message_die(GENERAL_ERROR, "Could not update block title information.", "", __LINE__, __FILE__, $sql); } - } - } // // Update cache --- 1292,1400 ---- foreach( $this->block_parameters as $parameter_name => $parameter_data ) { // ! // Switch for admin only parameters // ! if ($parameter_data['parameter_auth'] == 0 || $userdata['user_level'] == ADMIN) ! { ! $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 = ''; ! ! switch ( $parameter_data['parameter_type'] ) ! { ! case 'Boolean': ! case 'Text': ! case 'TextArea': ! $parameter_value = htmlspecialchars( trim( $parameter_value ) ); ! break; ! case 'BBText': ! $bbcode_uid = $parameter_opt = make_bbcode_uid(); ! $parameter_value = prepare_message($parameter_value, true, true, true, $bbcode_uid); ! break; ! case 'Html': ! $parameter_value = prepare_message($parameter_value, true, false, false); ! break; ! case 'Number': ! $parameter_value = intval($parameter_value); ! break; ! case 'Function': ! if( is_array($parameter_value) ) ! { ! //$parameter_value = implode(',' , htmlspecialchars($parameter_value)); ! $parameter_value = implode(',' , $parameter_value); ! } ! break; ! ! // Custom Fields ! case 'Radio_single_select': ! case 'Menu_single_select': ! $parameter_value = htmlspecialchars( trim( $parameter_value ) ); ! break; ! case 'Menu_multiple_select': ! case 'Checkbox_multiple_select': ! $parameter_value = addslashes( serialize( $parameter_value ) ); ! break; ! case 'Separator': ! break; ! ! default: ! $parameter_custom = $this->_submit_custom_module_parameters($parameter_data, $block_id); ! $parameter_value = $parameter_custom['parameter_value']; ! $parameter_opt = $parameter_custom['parameter_opt']; ! break; ! } ! // ! // Update block data // ! if ( $sub_id == $parameter_data['sub_id'] || true ) { ! // ! // If standard block ! // ! $sql = "UPDATE " . BLOCK_SYSTEM_PARAMETER_TABLE . " ! SET parameter_value = '" . str_replace("\'", "''", $parameter_value) . "', ! parameter_opt = '$parameter_opt' ! WHERE block_id = '$block_id' ! AND parameter_id = '$parameter_id' ! AND sub_id = '$sub_id'"; ! } ! else ! { ! /* ! // ! // If subblock ! // ! $sql = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . "(block_id, parameter_id, parameter_value, parameter_opt, sub_id) ! VALUES('$block_id','$parameter_id','" . str_replace("\'", "''", $parameter_value) . "','$parameter_opt', '$sub_id')"; ! */ ! } ! ! if( !($db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, "Couldn't update system parameter table", "", __LINE__, __FILE__, $sql); } + // + // Update block itself + // + if( $sub_id == 0 ) + { + $block_time = time(); + $block_editor_id = $userdata['user_id']; + + $sql = "UPDATE " . BLOCK_TABLE . " + SET block_time = '" . str_replace("\'", "''", $block_time) . "', + block_editor_id = '" . intval($block_editor_id) . "' + WHERE block_id = $block_id"; + + if( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) ) + { + mx_message_die(GENERAL_ERROR, "Could not update block title information.", "", __LINE__, __FILE__, $sql); + } + } + } // allowed parameter + } // End foreach // // Update cache Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** mx_functions_admincp.php 17 Dec 2005 00:31:43 -0000 1.16 --- mx_functions_admincp.php 17 Dec 2005 13:10:27 -0000 1.17 *************** *** 2608,2612 **** // // 0: parameter, 1: function_id, 2: parameter_id, 3: parameter_name, ! // 4: parameter_type, 5: parameter_default, 6: parameter_function // case 'parameter': --- 2608,2612 ---- // // 0: parameter, 1: function_id, 2: parameter_id, 3: parameter_name, ! // 4: parameter_type, 5: parameter_default, 6: parameter_function, 7: parameter_auth // case 'parameter': *************** *** 2615,2627 **** $key = $module_data[2]; ! $sql_add = "INSERT INTO " . PARAMETER_TABLE . " (function_id, parameter_id, parameter_name, parameter_type, parameter_default, parameter_function) ! VALUES ( '" . intval($module_data[1]) . "', '" . intval($module_data[2]) . "', '" . str_replace("\'", "''", $module_data[3]) . "', '" . str_replace("\'", "''",$module_data[4]) . "', '" . str_replace("\'", "''", $module_data[5]) . "', '" . str_replace("\'", "''", $module_data[6]) . "' ) "; $sql_update = "UPDATE " . PARAMETER_TABLE . " ! SET function_id = '" . intval($module_data[1]) . "', ! parameter_name = '" . str_replace("\'", "''",$module_data[3]) . "', ! parameter_type = '" . str_replace("\'", "''",$module_data[4]) . "', ! parameter_default = '" . str_replace("\'", "''", $module_data[5]) . "', ! parameter_function = '" . str_replace("\'", "''",$module_data[6]) . "' WHERE parameter_id = '" . intval( $module_data[2] ) . "'"; --- 2615,2628 ---- $key = $module_data[2]; ! $sql_add = "INSERT INTO " . PARAMETER_TABLE . " (function_id, parameter_id, parameter_name, parameter_type, parameter_default, parameter_function, parameter_auth) ! VALUES ( '" . intval($module_data[1]) . "', '" . intval($module_data[2]) . "', '" . str_replace("\'", "''", $module_data[3]) . "', '" . str_replace("\'", "''",$module_data[4]) . "', '" . str_replace("\'", "''", $module_data[5]) . "', '" . str_replace("\'", "''", $module_data[6]) . "', '" . str_replace("\'", "''", $module_data[7]) . "' ) "; $sql_update = "UPDATE " . PARAMETER_TABLE . " ! SET function_id = '" . intval($module_data[1]) . "', ! parameter_name = '" . str_replace("\'", "''",$module_data[3]) . "', ! parameter_type = '" . str_replace("\'", "''",$module_data[4]) . "', ! parameter_default = '" . str_replace("\'", "''", $module_data[5]) . "', ! parameter_function = '" . str_replace("\'", "''",$module_data[6]) . "', ! parameter_auth = '" . str_replace("\'", "''",$module_data[7]) . "' WHERE parameter_id = '" . intval( $module_data[2] ) . "'"; *************** *** 2960,2964 **** // 0: parameter, 1: function_id, 2: parameter_id, 3: parameter_name, ! // 4: parameter_type, 5: parameter_default, 6: parameter_function for( $p = 0; $p < count($resultset_param); $p++ ) { --- 2961,2965 ---- // 0: parameter, 1: function_id, 2: parameter_id, 3: parameter_name, ! // 4: parameter_type, 5: parameter_default, 6: parameter_function, 7: parameter_auth for( $p = 0; $p < count($resultset_param); $p++ ) { *************** *** 2968,2972 **** $module_pak .= $resultset_param[$p]['parameter_type'] . $delimeter; $module_pak .= $resultset_param[$p]['parameter_default'] . $delimeter; ! $module_pak .= $resultset_param[$p]['parameter_function'] . "\n"; $paramater_id = $resultset_param[$p]['parameter_id']; --- 2969,2974 ---- $module_pak .= $resultset_param[$p]['parameter_type'] . $delimeter; $module_pak .= $resultset_param[$p]['parameter_default'] . $delimeter; ! $module_pak .= $resultset_param[$p]['parameter_function'] . $delimeter; ! $module_pak .= $resultset_param[$p]['parameter_auth'] . "\n"; $paramater_id = $resultset_param[$p]['parameter_id']; |
