[mxbb-commits] core index.php,1.46,1.47

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

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

Modified Files:
	index.php 
Log Message:
Adding php5 support + minor fixes

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/index.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** index.php	9 Dec 2005 23:22:03 -0000	1.46
--- index.php	11 Dec 2005 16:13:39 -0000	1.47
***************
*** 24,27 ****
--- 24,38 ----
  include($mx_root_path . 'common.' . $phpEx);
  
+ // ------------------------------
+ // DEBUG ONLY ;-)
+ //
+ //error_reporting(E_ALL);
+ // ------------------------------
+ 
+ //
+ // Page selector
+ //
+ $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);
+ 
  //
  // Start session management
***************
*** 34,42 ****
  
  //
- // Page selector
- //
- $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);
- 
- //
  // Show copyrights
  //
--- 45,48 ----
***************
*** 116,133 ****
  			if ( $mx_block->is_dynamic )
  			{
  				$mx_dynamic_block = new mx_block();
! 				$mx_dynamic_block = $mx_block;	
  					
! 				$block_id = $mx_block->dynamic_block_id;
! 				$mx_block->init( $block_id );
  			}
  
  			if ( $mx_block->is_sub )
  			{
! 				$total_subs = $mx_block->total_subs;
! 				
  				$mx_parent_block = new mx_block();
! 				$mx_parent_block = $mx_block;
! 								
  			}
  			else
--- 122,146 ----
  			if ( $mx_block->is_dynamic )
  			{
+ 				//
+ 				// Create a parent block
+ 				//
  				$mx_dynamic_block = new mx_block();
! 				$mx_dynamic_block->init( $block_id );	
  					
! 				//
! 				// Instatiate the dynamic block
! 				//
! 				$mx_block->init( $mx_dynamic_block->dynamic_block_id );
  			}
  
  			if ( $mx_block->is_sub )
  			{
! 				//
! 				// Create a parent block
! 				//				
  				$mx_parent_block = new mx_block();
! 				$mx_parent_block->init( $block_id );
! 				
! 				$total_subs = $mx_parent_block->total_subs;				
  			}
  			else
***************
*** 135,139 ****
  				$total_subs = 1;
  			}
! 						
  			//
  			// Additional loop for subblocks - split block
--- 148,152 ----
  				$total_subs = 1;
  			}
! 
  			//
  			// Additional loop for subblocks - split block
***************
*** 141,149 ****
  			for( $subblock = 0; $subblock < $total_subs; $subblock++ )
  			{
! 				if ( $mx_parent_block->is_sub )
  				{
! 					$block_id = intval( $mx_parent_block->sub_block_ids[$subblock] );
! 					$mx_block->init( $block_id );
! 				}								
  					
  				//
--- 154,170 ----
  			for( $subblock = 0; $subblock < $total_subs; $subblock++ )
  			{
! 				if ( is_object($mx_parent_block) )
  				{
! 					if ($mx_parent_block->is_sub)
! 					{
! 						$block_id = intval( $mx_parent_block->sub_block_ids[$subblock] );
! 
! 						//
! 						// Instatiate the sub block
! 						//						
! 						$mx_block->init( $block_id );
! 					}
! 				}		
! 										
  					
  				//
***************
*** 206,212 ****
  					// Output editcp controls/buttons
  					//
! 					if ( $mx_dynamic_block->dynamic_block_id > 0 && $subblock == $total_subs - 1 && $mx_dynamic_block->auth_edit )
  					{
! 						$mx_dynamic_block->output_cp_button();
  					}
  					
--- 227,236 ----
  					// Output editcp controls/buttons
  					//
! 					if ( is_object($mx_dynamic_block) && $subblock == $total_subs - 1 )
  					{
! 						if ($mx_dynamic_block->dynamic_block_id > 0 && $mx_dynamic_block->auth_edit)
! 						{
! 							$mx_dynamic_block->output_cp_button();
! 						}
  					}
  					
***************
*** 246,250 ****
  				// Output some subblock wrappers
  				//
! 				if (isset($mx_parent_block))
  				{
  					if ( $mx_parent_block->is_sub )
--- 270,274 ----
  				// Output some subblock wrappers
  				//
! 				if (is_object($mx_parent_block))
  				{
  					if ( $mx_parent_block->is_sub )
***************
*** 278,287 ****
  			// Destroy parent block data
  			//
! 			if ( isset($mx_parent_block) && $mx_parent_block->is_sub )
  			{
  				unset( $mx_parent_block );
  			}
  			
! 			if ( isset($mx_dynamic_block) && is_object($mx_dynamic_block) )
  			{
  				unset( $mx_dynamic_block );
--- 302,311 ----
  			// Destroy parent block data
  			//
! 			if ( is_object($mx_parent_block) && $mx_parent_block->is_sub )
  			{
  				unset( $mx_parent_block );
  			}
  			
! 			if ( is_object($mx_dynamic_block) )
  			{
  				unset( $mx_dynamic_block );