[mxbb-commits] core/admin admin_mx_block_cp.php,1.7,1.8

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24645/admin

Modified Files:
	admin_mx_block_cp.php 
Log Message:
- fixing the html textblock
- fixing blockCP textblock preview

Index: admin_mx_block_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** admin_mx_block_cp.php	22 Oct 2005 23:07:00 -0000	1.7
--- admin_mx_block_cp.php	14 Dec 2005 14:49:20 -0000	1.8
***************
*** 59,62 ****
--- 59,63 ----
  $action = $mx_request_vars->request('action', MX_TYPE_NO_TAGS, '');
  $blog_mode = $mx_request_vars->request('blog_mode', MX_TYPE_NO_TAGS, '');
+ $sid = $mx_request_vars->request('sid', MX_TYPE_NO_TAGS, '');
  
  //
***************
*** 68,71 ****
--- 69,91 ----
  $blog_u = $mx_request_vars->request('u', MX_TYPE_INT, $userdata['user_id']);
  
+ //
+ // Parameters
+ //
+ $submit = ( isset($HTTP_POST_VARS['submit']) ) ? true : false;
+ $submit_pars = ( isset($HTTP_POST_VARS['submit_pars']) ) ? true : false;
+ $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
+ $preview = ( isset($HTTP_POST_VARS['preview']) ) ? true : false;
+ $refresh = $preview || $submit_search;
+ 
+ //
+ // Cancel
+ //
+ if( $cancel )
+ {
+ 	$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
+ 	header($header_location . append_sid(PORTAL_URL . "index.$phpEx?page=" . $portalpage, true));
+ 	exit;
+ }
+ 
  if ( empty($block_id) )
  {
***************
*** 84,99 ****
  
  //
- // Parameters
- //
- $submit = ( isset($HTTP_POST_VARS['submit']) ) ? true : false;
- $submit_pars = ( isset($HTTP_POST_VARS['submit_pars']) ) ? true : false;
- $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false;
- $preview = ( isset($HTTP_POST_VARS['preview']) ) ? true : false;
- $refresh = $preview || $submit_search;
- 
- //
  // SUBMIT?
  //
! if( !empty($mode) && !empty($action) )
  {
  	//
--- 104,110 ----
  
  //
  // SUBMIT?
  //
! if( !empty($mode) && !empty($action) && !$preview)
  {
  	//
***************
*** 192,207 ****
  
  //
- // Cancel
- //
- if( $cancel )
- {
- 	$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
- 	header($header_location . append_sid(PORTAL_URL . "index.$phpEx?page=" . $portalpage, true));
- 	exit;
- }
- 
- $error = false;
- 
- //
  // Start output
  //
--- 203,206 ----