[mxbb-commits] core/includes mx_functions.php,1.54,1.55

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

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

Modified Files:
	mx_functions.php 
Log Message:
updated mxBB search block and utilities

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** mx_functions.php	11 Dec 2005 16:13:39 -0000	1.54
--- mx_functions.php	13 Dec 2005 20:04:26 -0000	1.55
***************
*** 569,573 ****
  | Eg: get_page_id('dload.php', true)
  \********************************************************************************/
! function get_page_id($search_item, $use_function_file = false)
  {
  	global $db, $userdata, $mx_config_cache;
--- 569,573 ----
  | Eg: get_page_id('dload.php', true)
  \********************************************************************************/
! function get_page_id($search_item, $use_function_file = false, $get_page_data_array = false)
  {
  	global $db, $userdata, $mx_config_cache;
***************
*** 578,587 ****
  	$cache_key = 'pagemap_block' . $search_item;
  	
  	if ( $mx_config_cache->exists( $cache_key ) )
  	{
! 		$page_id = $mx_config_cache->get( $cache_key );
! 		return $page_id;
  	}
! 	else
  	{
  		if( $use_function_file )
--- 578,589 ----
  	$cache_key = 'pagemap_block' . $search_item;
  	
+ 	$page_id_array = array();
  	if ( $mx_config_cache->exists( $cache_key ) )
  	{
! 		$page_id_array = unserialize( $mx_config_cache->get( $cache_key ) );
  	}
! 	
! 	
! 	if (empty($page_id_array['page_id']))
  	{
  		if( $use_function_file )
***************
*** 607,611 ****
  		// First, see if we can get the page_id from ordinary blocks
  		//
! 		$sql = "SELECT pag.page_id
  			FROM " . COLUMN_BLOCK_TABLE . " bct,
  		       	" . PAGE_TABLE . " pag,
--- 609,613 ----
  		// First, see if we can get the page_id from ordinary blocks
  		//
! 		$sql = "SELECT pag.page_id, pag.page_name, pag.page_desc
  			FROM " . COLUMN_BLOCK_TABLE . " bct,
  		       	" . PAGE_TABLE . " pag,
***************
*** 614,618 ****
  				AND bct.column_id = col.column_id
  				AND bct.block_id = '" . $search_item . "'
! 	   		ORDER BY pag.page_id";
  	
  		if( !($p_result = $db->sql_query($sql)) )
--- 616,621 ----
  				AND bct.column_id = col.column_id
  				AND bct.block_id = '" . $search_item . "'
! 	   		ORDER BY pag.page_id
! 			LIMIT 1";
  	
  		if( !($p_result = $db->sql_query($sql)) )
***************
*** 627,631 ****
  			// Find all dynamic block Page_ids, if not present as ordinary block
  			//
! 			$sql = "SELECT pag.page_id
  				FROM " . PAGE_TABLE . " pag,
  					" . BLOCK_TABLE . " blk,
--- 630,634 ----
  			// Find all dynamic block Page_ids, if not present as ordinary block
  			//
! 			$sql = "SELECT pag.page_id, pag.page_name, pag.page_desc, nav.block_id
  				FROM " . PAGE_TABLE . " pag,
  					" . BLOCK_TABLE . " blk,
***************
*** 636,640 ****
  					AND nav.block_id = blk.block_id
  					AND nav.block_id = '" . $search_item . "'
! 				ORDER BY blk.block_id";
  		
  			if( !($p_result = $db->sql_query($sql)) )
--- 639,644 ----
  					AND nav.block_id = blk.block_id
  					AND nav.block_id = '" . $search_item . "'
! 				ORDER BY blk.block_id
! 				LIMIT 1";
  		
  			if( !($p_result = $db->sql_query($sql)) )
***************
*** 648,652 ****
  		if( empty($p_row['page_id']) )
  		{
! 			$sql = "SELECT pag.page_id, sys.parameter_value
  				FROM " . COLUMN_BLOCK_TABLE . " bct,
  			       	" . PAGE_TABLE . " pag,
--- 652,659 ----
  		if( empty($p_row['page_id']) )
  		{
! 			//
! 			// Find all subblock page_ids
! 			//
! 			$sql = "SELECT pag.page_id, pag.page_name, pag.page_desc, sys.parameter_value
  				FROM " . COLUMN_BLOCK_TABLE . " bct,
  			       	" . PAGE_TABLE . " pag,
***************
*** 674,678 ****
  					if ($block_id = $search_item)
  					{
! 						$p_row['page_id'] = $temp_row['page_id'];
  						continue;
  					}
--- 681,685 ----
  					if ($block_id = $search_item)
  					{
! 						$p_row = $temp_row;
  						continue;
  					}
***************
*** 686,695 ****
  		}		
  		
! 		$page_id = ( !empty($p_row['page_id']) ) ? $p_row['page_id'] : '';
  		
! 		$mx_config_cache->put( $cache_key, $page_id );
  	}
  
! 	return $page_id;
  }
  
--- 693,722 ----
  		}		
  		
! 		$page_id_array = array();
! 		if (!empty($p_row['page_id']))
! 		{
! 			$page_id_array['page_id'] = $p_row['page_id'];	
! 			$page_id_array['page_name'] = $p_row['page_name'];	
! 			$page_id_array['page_desc'] = $p_row['page_desc'];	
! 			$page_id_array['block_id'] = $p_row['block_id'];	
! 		}
  		
! 		$mx_config_cache->put( $cache_key, serialize($page_id_array) );
  	}
  
! 	if ( $get_page_data_array && !empty($page_id_array['page_id']) )
! 	{
! 		$return = $page_id_array;
! 	}
! 	else if(!empty($page_id_array['page_id']))
! 	{
! 		$return = $page_id_array['page_id'];
! 	}
! 	else 
! 	{
! 		$return = '';
! 	}
! 			
! 	return $return;
  }