Menu
▾
▴
[mxbb-commits] core/admin admin_mx_block_cp.php, 1.27, 1.28 admin_mx_module.php, 1.52, 1.53 admin_mx_module_cp.php, 1.27, 1.28 admin_mx_words.php, 1.4, 1.5 index.php, 1.64, 1.65 page_header_admin.php, 1.32, 1.33 pagestart.php, 1.41, 1.42
Update of /cvsroot/mxbb/core/admin In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11742 Modified Files: admin_mx_block_cp.php admin_mx_module.php admin_mx_module_cp.php admin_mx_words.php index.php page_header_admin.php pagestart.php Log Message: fixing some missing varables and indexes in AdminCP Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** admin_mx_module.php 17 Jun 2013 02:53:26 -0000 1.52 --- admin_mx_module.php 25 Jun 2013 17:15:34 -0000 1.53 *************** *** 118,130 **** $s_hidden_module_install_fields = '<input type="hidden" name="mode" value="' . MX_MODULE_TYPE . '" /> <input type="hidden" name="action" value="' . MX_DO_INSTALL . '" /> ! <input type="hidden" name="id" value="' . $module_id . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! $result_message_height = $is_pak ? '300px' : '50px'; // // Hidden vars // ! $s_hidden_fields_module = '<input type="hidden" name="mode" value="add" /><input type="hidden" name="id" value="' . $module_id . '" />'; // --- 118,130 ---- $s_hidden_module_install_fields = '<input type="hidden" name="mode" value="' . MX_MODULE_TYPE . '" /> <input type="hidden" name="action" value="' . MX_DO_INSTALL . '" /> ! <input type="hidden" name="id" value="' . $nav_module_id . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! $result_message_height = isset($is_pak) ? '300px' : '50px'; // // Hidden vars // ! $s_hidden_fields_module = '<input type="hidden" name="mode" value="add" /><input type="hidden" name="id" value="' . $nav_module_id . '" />'; // *************** *** 135,140 **** 'L_EXPLAIN' => $lang['Module_admin_explain'], ! 'NAV_MODULE_ID' => $nav_module_id, ! 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:'.$result_message_height.'"><span class="gensmall">' . $result_message . '<br/> -::-</span></div>': '', // --- 135,140 ---- 'L_EXPLAIN' => $lang['Module_admin_explain'], ! 'NAV_MODULE_ID' => $nav_module_id, ! 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:'.$result_message_height.'"><span class="gensmall">' . $result_message . '<br/> -::-</span></div>': '', // *************** *** 209,213 **** $module_rows_current = $db->sql_fetchrowset($q_modules_current); } ! $db->sql_freeresult($result); // --- 209,213 ---- $module_rows_current = $db->sql_fetchrowset($q_modules_current); } ! $db->sql_freeresult($q_modules_current); // *************** *** 229,234 **** $module_rows = $db->sql_fetchrowset($q_modules); } ! ! $db->sql_freeresult($result); if ( $total_modules + $total_modules_current == 0 ) --- 229,233 ---- $module_rows = $db->sql_fetchrowset($q_modules); } ! $db->sql_freeresult($q_modules); if ( $total_modules + $total_modules_current == 0 ) *************** *** 250,259 **** // Loop through the rows of modules setting block vars for the template. // ! for( $module_count = -1; $module_count < $total_modules; $module_count++ ) { // // Give main vars specific names // ! $new_module = $module_count == -1; $newmode = $new_module ? 'add' : 'modify'; --- 249,258 ---- // Loop through the rows of modules setting block vars for the template. // ! for( $module_count = 0; $module_count < $total_modules; $module_count++ ) { // // Give main vars specific names // ! $new_module = $module_count == 0; $newmode = $new_module ? 'add' : 'modify'; Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** page_header_admin.php 17 Jun 2013 02:53:26 -0000 1.32 --- page_header_admin.php 25 Jun 2013 17:15:34 -0000 1.33 *************** *** 65,69 **** $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); ! $template->assign_vars(array( 'SITENAME' => $board_config['sitename'], --- 65,69 ---- $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); ! $template_config_row = $mx_user->_load_template_config(); $template->assign_vars(array( 'SITENAME' => $board_config['sitename'], *************** *** 86,90 **** // These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file ! 'T_HEAD_STYLESHEET' => $mx_user->theme['head_stylesheet'], //'T_BODY_BACKGROUND' => $mx_user->theme['body_background'], 'T_BODY_BGCOLOR' => '#'.$mx_user->theme['body_bgcolor'], --- 86,90 ---- // These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file ! 'T_HEAD_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : 'stylesheet.css', //'T_BODY_BACKGROUND' => $mx_user->theme['body_background'], 'T_BODY_BGCOLOR' => '#'.$mx_user->theme['body_bgcolor'], *************** *** 131,136 **** 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'T_PHPBB_STYLESHEET' => $mx_user->theme['head_stylesheet'], ! 'T_MXBB_STYLESHEET' => $mx_user->theme['head_stylesheet'], 'T_GECKO_STYLESHEET' => 'gecko.css', --- 131,136 ---- 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'T_PHPBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : 'stylesheet.css', ! 'T_MXBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : $mx_user->template_name.'.css', 'T_GECKO_STYLESHEET' => 'gecko.css', Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** index.php 17 Jun 2013 03:24:00 -0000 1.64 --- index.php 25 Jun 2013 17:15:34 -0000 1.65 *************** *** 18,22 **** // Security and Page header // ! @define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 18,22 ---- // Security and Page header // ! define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); *************** *** 153,158 **** while( list($action, $file) = each($action_array) ) { ! $row_color = ( !($row_count%2) ) ? $mx_user->theme['td_color1'] : $mx_user->theme['td_color2']; ! $row_class = ( !($row_count%2) ) ? $mx_user->theme['td_class1'] : $mx_user->theme['td_class2']; $action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action); --- 153,158 ---- while( list($action, $file) = each($action_array) ) { ! $row_color = (!($row_count%2)) ? $mx_user->theme['td_color1'] : $mx_user->theme['td_color2']; ! $row_class = (!($row_count%2)) ? $mx_user->theme['td_class1'] : $mx_user->theme['td_class2']; $action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action); *************** *** 196,203 **** $module_rows = $db->sql_fetchrowset($q_modules); } ! $db->sql_freeresult($result); $module_mx = array(); ! for( $module_cnt = 0; $module_cnt < $total_modules; $module_cnt++ ) { $module_path_admin = $mx_root_path . $module_rows[$module_cnt]['module_path'] . "admin/"; --- 196,203 ---- $module_rows = $db->sql_fetchrowset($q_modules); } ! $db->sql_freeresult($q_modules); $module_mx = array(); ! for($module_cnt = 0; $module_cnt < $total_modules; $module_cnt++) { $module_path_admin = $mx_root_path . $module_rows[$module_cnt]['module_path'] . "admin/"; *************** *** 505,512 **** /* Begin MX-Publisher version check code block */ $current_MXP_version = explode('.', $portal_config['portal_version']); ! $minor_MXP_revision = (int) $current_MXP_version[2]; $errno = 0; ! $errstr = $MXP_version_info = ''; $mx_version_check = false; --- 505,512 ---- /* Begin MX-Publisher version check code block */ $current_MXP_version = explode('.', $portal_config['portal_version']); ! $minor_mx_revision = (int) $current_MXP_version[2]; $errno = 0; ! $errstr = $mx_version_info = ''; $mx_version_check = false; *************** *** 534,538 **** if ($get_info) { ! $MXP_version_info .= fread($fsock, 1024); } else --- 534,538 ---- if ($get_info) { ! $mx_version_info .= fread($fsock, 1024); } else *************** *** 546,564 **** fclose($fsock); ! $MXP_version_info = explode("\n", $MXP_version_info); ! $latest_MXP_head_revision = (int) $MXP_version_info[0]; ! $latest_MXP_minor_revision = (int) $MXP_version_info[2]; ! $latest_MXP_patch_revision = (int) $MXP_version_info[3]; // For betas/RC ! $latest_MXP_version = (int) $MXP_version_info[0] . '.' . (int) $MXP_version_info[1] . '.' . (int) $MXP_version_info[2]; ! if ($latest_MXP_head_revision == 3 && $minor_MXP_revision == $latest_MXP_minor_revision) { ! $MXP_version_info = '<p style="color:green">' . $lang['MXP_Version_up_to_date'] . '</p>'; } else { ! $MXP_version_info = '<p style="color:red">' . $lang['MXP_Version_outdated']; ! $MXP_version_info .= '<br />' . sprintf($lang['MXP_Latest_version_info'], $latest_MXP_version) . sprintf($lang['MXP_Current_version_info'], $portal_config['portal_version']) . '</p>'; } } --- 546,564 ---- fclose($fsock); ! $mx_version_info = explode("\n", $mx_version_info); ! $latest_mx_head_revision = (int) $mx_version_info[0]; ! $latest_mx_minor_revision = (int) $mx_version_info[2]; ! $latest_mx_patch_revision = (int) $mx_version_info[3]; // For betas/RC ! $latest_mx_version = (int) $mx_version_info[0] . '.' . (int) $mx_version_info[1] . '.' . (int) $mx_version_info[2]; ! if ($latest_mx_head_revision == 3 && $minor_mx_revision == $latest_mx_minor_revision) { ! $mx_version_info = '<p style="color:green">' . $lang['MXP_Version_up_to_date'] . '</p>'; } else { ! $mx_version_info = '<p style="color:red">' . $lang['MXP_Version_outdated']; ! $mx_version_info .= '<br />' . sprintf($lang['MXP_Latest_version_info'], $latest_mx_version) . sprintf($lang['MXP_Current_version_info'], $portal_config['portal_version']) . '</p>'; } } *************** *** 567,582 **** if ($errstr) { ! $MXP_version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>'; } else { ! $MXP_version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>'; } } ! $MXP_version_info .= '<p>' . $lang['MXP_Mailing_list_subscribe_reminder'] . '</p>'; $template->assign_vars(array( ! 'MXP_VERSION_INFO' => $MXP_version_info, 'PHPBB_VERSION_INFO' => $phpbb_version_info, 'L_VERSION_INFORMATION' => $lang['Version_information']) --- 567,582 ---- if ($errstr) { ! $mx_version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>'; } else { ! $mx_version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>'; } } ! $mx_version_info .= '<p>' . $lang['MXP_Mailing_list_subscribe_reminder'] . '</p>'; $template->assign_vars(array( ! 'MXBB_VERSION_INFO' => $mx_version_info, 'PHPBB_VERSION_INFO' => $phpbb_version_info, 'L_VERSION_INFORMATION' => $lang['Version_information']) Index: admin_mx_words.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_words.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_mx_words.php 17 Jun 2013 02:53:26 -0000 1.4 --- admin_mx_words.php 25 Jun 2013 17:15:34 -0000 1.5 *************** *** 41,44 **** --- 41,47 ---- include_once('./page_header_admin.' . $phpEx); + $cancel = ($mx_request_vars->is_request('cancel')) ? true : false; + $no_page_header = $cancel; + if ($cancel) { *************** *** 250,255 **** $word_id = $word_rows[$i]['word_id']; ! $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; ! $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; $template->assign_block_vars("words", array( --- 253,258 ---- $word_id = $word_rows[$i]['word_id']; ! $row_color = ( !($i % 2) ) ? $mx_user->theme['td_color1'] : $mx_user->theme['td_color2']; ! $row_class = ( !($i % 2) ) ? $mx_user->theme['td_class1'] : $mx_user->theme['td_class2']; $template->assign_block_vars("words", array( Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** admin_mx_module_cp.php 17 Jun 2013 02:53:26 -0000 1.27 --- admin_mx_module_cp.php 25 Jun 2013 17:15:34 -0000 1.28 *************** *** 348,356 **** $module_rows_current = $db->sql_fetchrowset($q_modules_current); } ! $db->sql_freeresult($result); ! // ! // Get the rest modules ! // $sql = "SELECT * FROM " . MODULE_TABLE . " --- 348,356 ---- $module_rows_current = $db->sql_fetchrowset($q_modules_current); } ! $db->sql_freeresult($q_modules_current); ! /* ! * Get the rest modules ! */ $sql = "SELECT * FROM " . MODULE_TABLE . " *************** *** 368,373 **** $module_rows = $db->sql_fetchrowset($q_modules); } ! ! $db->sql_freeresult($result); if ( $total_modules + $total_modules_current == 0 ) --- 368,372 ---- $module_rows = $db->sql_fetchrowset($q_modules); } ! $db->sql_freeresult($q_modules); if ( $total_modules + $total_modules_current == 0 ) *************** *** 389,393 **** // Module loop // ! for( $module_count = 0; $module_count < $total_modules + 1; $module_count++ ) { // --- 388,392 ---- // Module loop // ! for( $module_count = 0; $module_count < $total_modules; $module_count++ ) { // *************** *** 543,548 **** $function_rows = $db->sql_fetchrowset($q_functions); } ! ! $db->sql_freeresult($result); if ( $total_functions == 0 ) --- 542,546 ---- $function_rows = $db->sql_fetchrowset($q_functions); } ! $db->sql_freeresult($q_functions); if ( $total_functions == 0 ) *************** *** 679,690 **** )); } ! ! // // Parameter loop - // for( $parameter_count = 0; $parameter_count < $total_parameters + 1; $parameter_count++ ) { $new_parameter = $parameter_count == $total_parameters; ! $parameter_id = $new_parameter ? $function_id . '_0': $parameter_rows[$parameter_count]['parameter_id']; $id = $new_parameter ? $function_id : $parameter_id; --- 677,688 ---- )); } ! // Parameter loop for( $parameter_count = 0; $parameter_count < $total_parameters + 1; $parameter_count++ ) { $new_parameter = $parameter_count == $total_parameters; ! $parameter_id = isset($new_parameter) ? $function_id . '_0': $parameter_rows[$parameter_count]['parameter_id']; ! $parameter_desc = isset($parameter_rows[$parameter_count]['parameter_desc']) ? $parameter_rows[$parameter_count]['parameter_desc'] : 0; ! $parameter_order = isset($parameter_rows[$parameter_count]['parameter_order']) ? $parameter_rows[$parameter_count]['parameter_order'] : 0; $id = $new_parameter ? $function_id : $parameter_id; *************** *** 693,702 **** $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $parameter_id; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $parameter_id . '&function_id=' . $function_id . '&block_order=' . $block_order . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $parameter_id . '&function_id=' . $function_id . '&block_order=' . $block_order . '&move=15'; ! ! // // Hidden fields - // $s_hidden_parameter_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> <input type="hidden" name="action" value="' . $action . '" /> --- 691,698 ---- $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $parameter_id; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $parameter_id . '&function_id=' . $function_id . '&parameter_order=' . $parameter_order . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $parameter_id . '&function_id=' . $function_id . '&parameter_order=' . $parameter_order . '&move=15'; ! // Hidden fields $s_hidden_parameter_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> <input type="hidden" name="action" value="' . $action . '" /> *************** *** 705,712 **** $parameter_title = !$new_parameter ? $parameter_rows[$parameter_count]['parameter_name'] : ''; ! $parameter_type_key = $parameter_rows[$parameter_count]['parameter_type']; $parameter_type = !$new_parameter ? get_list_static('parameter_type', $type_row, $parameter_type_key) : get_list_static('parameter_type', $type_row, 'BBText'); ! $parameter_function = $parameter_rows[$parameter_count]['parameter_function']; $parameter_function = !$new_parameter && !empty($parameter_function) ? ( $parameter_rows[$parameter_count]['parameter_type'] != 'Function' ? implode( "\n", unserialize( stripslashes( $parameter_function ) ) ) : $parameter_function ) : ''; --- 701,708 ---- $parameter_title = !$new_parameter ? $parameter_rows[$parameter_count]['parameter_name'] : ''; ! $parameter_type_key = isset($parameter_rows[$parameter_count]['parameter_type']) ? $parameter_rows[$parameter_count]['parameter_type'] : 0; $parameter_type = !$new_parameter ? get_list_static('parameter_type', $type_row, $parameter_type_key) : get_list_static('parameter_type', $type_row, 'BBText'); ! $parameter_function = isset($parameter_rows[$parameter_count]['parameter_function']) ? $parameter_rows[$parameter_count]['parameter_function'] : 0; $parameter_function = !$new_parameter && !empty($parameter_function) ? ( $parameter_rows[$parameter_count]['parameter_type'] != 'Function' ? implode( "\n", unserialize( stripslashes( $parameter_function ) ) ) : $parameter_function ) : ''; *************** *** 818,825 **** )); } ! ! // // Block loop - // for( $block_count = 0; $block_count < $total_blocks + 1; $block_count++ ) { --- 814,819 ---- )); } ! // Block loop for( $block_count = 0; $block_count < $total_blocks + 1; $block_count++ ) { *************** *** 827,839 **** $block_id = $new_block ? $function_id . '_0' : $block_rows[$block_count]['block_id']; $id = $new_block ? $function_id : $block_id; ! $mode = MX_BLOCK_TYPE; $mode_private = MX_BLOCK_PRIVATE_TYPE; $action = $new_block ? MX_DO_INSERT : MX_DO_UPDATE; $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $block_id; ! ! // // Hidden fields - // $s_hidden_block_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> <input type="hidden" name="action" value="' . $action . '" /> --- 821,831 ---- $block_id = $new_block ? $function_id . '_0' : $block_rows[$block_count]['block_id']; $id = $new_block ? $function_id : $block_id; ! $s_column_span = 0; $mode = MX_BLOCK_TYPE; $mode_private = MX_BLOCK_PRIVATE_TYPE; $action = $new_block ? MX_DO_INSERT : MX_DO_UPDATE; $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $block_id; ! // Hidden fields $s_hidden_block_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> <input type="hidden" name="action" value="' . $action . '" /> *************** *** 841,847 **** <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; - // // Hidden fields - // $s_hidden_block_private_fields = '<input type="hidden" name="mode" value="' . $mode_private . '" /> <input type="hidden" name="action" value="' . MX_DO_UPDATE . '" /> --- 833,837 ---- *************** *** 882,889 **** $block_rows[$block_count][$block_auth_fields[1]] = AUTH_ADMIN; } ! ! // // Block subpanel - edit - // $visible_tag_edit = in_array('adminEdit_' . $block_id, $cookie_states); $visible_tag_private = in_array('adminPrivate_' . $block_id, $cookie_states); --- 872,877 ---- $block_rows[$block_count][$block_auth_fields[1]] = AUTH_ADMIN; } ! // Block subpanel - edit $visible_tag_edit = in_array('adminEdit_' . $block_id, $cookie_states); $visible_tag_private = in_array('adminPrivate_' . $block_id, $cookie_states); *************** *** 918,924 **** 'U_BLOCK_PERMISSIONS' => mx_append_sid(PORTAL_URL . "admin/admin_mx_block_auth.$phpEx?cat_id=$block_id"), - // // Block subpanel - edit - // 'L_FUNCTION' => $lang['Function'], --- 906,910 ---- *************** *** 946,952 **** 'S_SHOW_STATS_NO' => $show_stats_no, - // // Quick Panels - // 'MESSAGE_DELETE' => $message_delete, --- 932,936 ---- *************** *** 959,965 **** if ($mx_modulecp_include_block_quickedit) { - // // Auth - // for( $l = 0; $l < count($block_auth_fields); $l++ ) { --- 943,947 ---- Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** pagestart.php 17 Jun 2013 02:53:26 -0000 1.41 --- pagestart.php 25 Jun 2013 17:15:34 -0000 1.42 *************** *** 25,34 **** if( !function_exists('prepare_message') ) { ! mx_cache::load_file('functions_post', 'phpbb2'); } if( !function_exists('add_search_words') ) { ! mx_cache::load_file('functions_search', 'phpbb2'); } --- 25,34 ---- if( !function_exists('prepare_message') ) { ! $mx_cache->load_file('functions_post', 'phpbb2'); } if( !function_exists('add_search_words') ) { ! $mx_cache->load_file('functions_search', 'phpbb2'); } Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** admin_mx_block_cp.php 17 Jun 2013 02:53:26 -0000 1.27 --- admin_mx_block_cp.php 25 Jun 2013 17:15:34 -0000 1.28 *************** *** 50,56 **** $sid = $mx_request_vars->request('sid', MX_TYPE_NO_TAGS, ''); - // // Initial vars - // $block_id = $mx_request_vars->is_request('block_id') ? $mx_request_vars->request('block_id', MX_TYPE_INT, '') : $mx_request_vars->request('id', MX_TYPE_INT, ''); $portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, 0); --- 50,54 ---- *************** *** 58,69 **** $blog_u = $mx_request_vars->request('u', MX_TYPE_INT, $userdata['user_id']); - // // Parameters - // $submit = $mx_request_vars->is_post('submit'); $submit_pars = $mx_request_vars->is_post('submit_pars'); $cancel = $mx_request_vars->is_post('cancel'); $preview = $mx_request_vars->is_post('preview'); ! $refresh = $preview || $submit_search; // --- 56,65 ---- $blog_u = $mx_request_vars->request('u', MX_TYPE_INT, $userdata['user_id']); // Parameters $submit = $mx_request_vars->is_post('submit'); $submit_pars = $mx_request_vars->is_post('submit_pars'); $cancel = $mx_request_vars->is_post('cancel'); $preview = $mx_request_vars->is_post('preview'); ! $refresh = $preview || $submit; // *************** *** 159,165 **** } // if .. !empty($mode) - // // Hidden vars - // $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; $s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $block_id . '" />'; --- 155,159 ---- |
