[mxbb-commits] core/modules/mx_coreblocks mx_blockcp.php, 1.25, 1.26

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_coreblocks
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3752/modules/mx_coreblocks

Modified Files:
	mx_blockcp.php 
Log Message:


Index: mx_blockcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** mx_blockcp.php	13 Jul 2008 19:31:26 -0000	1.25
--- mx_blockcp.php	2 Jul 2013 02:24:03 -0000	1.26
***************
*** 114,118 ****
  $cancel = $mx_request_vars->is_post('cancel');
  $preview = $mx_request_vars->is_post('preview');
! $refresh = $preview || $submit_search;
  
  //
--- 114,118 ----
  $cancel = $mx_request_vars->is_post('cancel');
  $preview = $mx_request_vars->is_post('preview');
! $refresh = $preview || isset($submit_search);
  
  //
***************
*** 206,209 ****
--- 206,212 ----
  		$result_message = $mx_blockcp->submit_parameters($block_id);
  	}
+ 	$block_info = mx_get_info(BLOCK_TABLE, 'block_id', $block_id);
+ 	$module_id = !empty($module_id) ? $module_id : '';
+ 	$function_id = !empty($function_id) ? $function_id : $block_info['function_id'];
  
  	$has_dyn_block_id = $dynamic_block_id > 0 ? '&dynamic_block='.$dynamic_block_id : '';
***************
*** 212,216 ****
  
  } // if .. !empty($mode)
! 
  $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
  $s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $block_id . '" />';
--- 215,219 ----
  
  } // if .. !empty($mode)
! $blog_u = isset($blog_u) ? $blog_u : "/";
  $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
  $s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $block_id . '" />';
***************
*** 219,223 ****
  $s_hidden_fields .= '<input type="hidden" name="sub_id" value="' . $sub_id . '" />';
  $s_hidden_fields .= '<input type="hidden" name="u" value="' . $blog_u . '" />';
! $s_hidden_fields .= '<input type="hidden" name="blog_mode" value="' . $blog_mode . '" />';
  
  // **********************************************************************
--- 222,226 ----
  $s_hidden_fields .= '<input type="hidden" name="sub_id" value="' . $sub_id . '" />';
  $s_hidden_fields .= '<input type="hidden" name="u" value="' . $blog_u . '" />';
! $s_hidden_fields .= '<input type="hidden" name="blog_mode" value="' . $mode . '" />';
  
  // **********************************************************************
***************
*** 244,250 ****
  	// Removed from here atm
  	//
! 	// $mx_dynamic_select = new mx_dynamic_select();
! 	// $mx_dynamic_select->generate($block_id);
! 	// $blockcptemplate->assign_block_vars('dynamic_select', array());
  }
  
--- 247,253 ----
  	// Removed from here atm
  	//
! 	$mx_dynamic_select = new mx_dynamic_select();
! 	$mx_dynamic_select->generate($block_id);
! 	$blockcptemplate->assign_block_vars('dynamic_select', array());
  }
  
***************
*** 252,261 ****
  // Setup config parameters
  //
! //$block_config = $mode == 'editblog' ? read_block_config($block_id, false, $sub_id) : read_block_config($block_id, false);
  
  //
  // Blog mode:
  //
! //$blog_validate = ( $blog_mode == 'group' ) ? mx_auth_group($sub_id, true) : $sub_id == $userdata['user_id'];
  
  /*
--- 255,264 ----
  // Setup config parameters
  //
! $block_config = $mode == 'editblog' ? read_block_config($block_id, false, $sub_id) : read_block_config($block_id, false);
  
  //
  // Blog mode:
  //
! $blog_validate = ( $mode == 'group' ) ? mx_auth_group($sub_id, true) : $sub_id == $userdata['user_id'];
  
  /*