[mxbb-commits] core/includes mx_functions_admincp.php, 1.66, 1.67 mx_functions_core.php, 1.117, 1.118 mx_functions_style.php, 1.113, 1.114 mx_functions_tools.php, 1.56, 1.57

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29098

Modified Files:
	mx_functions_admincp.php mx_functions_core.php 
	mx_functions_style.php mx_functions_tools.php 
Log Message:
upd

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** mx_functions_core.php	28 Sep 2009 11:24:28 -0000	1.117
--- mx_functions_core.php	8 Oct 2009 17:01:05 -0000	1.118
***************
*** 2207,2210 ****
--- 2207,2211 ----
  
  		$return = false;
+ 		$table = BLOCK_SYSTEM_PARAMETER_TABLE;
  		if ( $this->_parameter_data_exist() )
  		{
***************
*** 2263,2278 ****
  						break;
  					}
! 
  					//
  					// Update block data
  					//
! 					if ( true )
! 					{
! 						$sub_id = $mx_request_vars->is_request('virtual') ? $mx_request_vars->request('virtual', MX_TYPE_INT, 0) : 0;
! 
  						//
  						// If standard block
  						//
! 						$sql = "UPDATE " . BLOCK_SYSTEM_PARAMETER_TABLE . "
  							SET parameter_value		= '" . str_replace("\'", "''", $parameter_value) . "',
  								parameter_opt      	= '$parameter_opt'
--- 2264,2279 ----
  						break;
  					}
! 					
  					//
  					// Update block data
  					//
! 					if ($sub_id == $parameter_data['sub_id'] || true)
! 					{	
! 						$sub_id = $mx_request_vars->is_request('virtual') ? $mx_request_vars->request('virtual', MX_TYPE_INT, 0) : $sub_id;
! 					
  						//
  						// If standard block
  						//
! 						$sql = "UPDATE " . $table . "
  							SET parameter_value		= '" . str_replace("\'", "''", $parameter_value) . "',
  								parameter_opt      	= '$parameter_opt'
***************
*** 2283,2287 ****
  					else
  					{
- 						/*
  						//
  						// If subblock
--- 2284,2287 ----
***************
*** 2289,2294 ****
  						$sql = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . "(block_id, parameter_id, parameter_value, parameter_opt, sub_id)
  							VALUES('$block_id','$parameter_id','" . str_replace("\'", "''", $parameter_value) . "','$parameter_opt', '$sub_id')";
! 						*/
! 					}
  
  					if( !($db->sql_query($sql)) )
--- 2289,2293 ----
  						$sql = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . "(block_id, parameter_id, parameter_value, parameter_opt, sub_id)
  							VALUES('$block_id','$parameter_id','" . str_replace("\'", "''", $parameter_value) . "','$parameter_opt', '$sub_id')";
! 					}					
  
  					if( !($db->sql_query($sql)) )
***************
*** 2300,2304 ****
  					// Update block itself
  					//
! 					if( $sub_id == 0 )
  					{
  						$block_time = time();
--- 2299,2303 ----
  					// Update block itself
  					//
! 					if ($sub_id == $parameter_data['sub_id'] || false)
  					{
  						$block_time = time();

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** mx_functions_style.php	23 Jan 2009 10:26:08 -0000	1.113
--- mx_functions_style.php	8 Oct 2009 17:01:06 -0000	1.114
***************
*** 1380,1389 ****
  		//
  		$this->_init_style();
! 
  		//
  		// Load images
! 		//
! 		$this->_load_phpbb_images();		
! 		$this->_load_mxbb_images();		
  	}
  
--- 1380,1403 ----
  		//
  		$this->_init_style();
! 		
  		//
  		// Load images
! 		//		
! 		switch (PORTAL_BACKEND)
! 		{
! 			case 'internal':
! 				$this->_load_phpbb_images();		
! 				$this->_load_mxbb_images();	
! 			break;
! 				
! 			case 'phpbb2':
! 			break;
! 
! 			case 'phpbb3':
! 
! 				$this->_load_phpbb_images();		
! 				$this->_load_mxbb_images();	
! 			break;
! 		}			
  	}
  

Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** mx_functions_admincp.php	18 Jun 2009 21:38:58 -0000	1.66
--- mx_functions_admincp.php	8 Oct 2009 17:01:05 -0000	1.67
***************
*** 3149,3153 ****
  	 *
  	 * This function indexes search words for textblocks.
! 	 *
  	 * @access private
  	 * @param string $mode single or ?
--- 3149,3153 ----
  	 *
  	 * This function indexes search words for textblocks.
! 	 * Old outdated function need to be fixed
  	 * @access private
  	 * @param string $mode single or ?
***************
*** 3299,3303 ****
  				if ( !$db->sql_query($sql) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Could not insert new word', '', __LINE__, __FILE__, $sql);
  				}
  				$db->sql_freeresult($result);
--- 3299,3303 ----
  				if ( !$db->sql_query($sql) )
  				{
! 					//mx_message_die(GENERAL_ERROR, 'Could not insert new word', '', __LINE__, __FILE__, $sql);
  				}
  				$db->sql_freeresult($result);
***************
*** 3317,3321 ****
  				if ( !$db->sql_query($sql) )
  				{
! 					mx_message_die(GENERAL_ERROR, 'Could not insert new word matches', '', __LINE__, __FILE__, $sql);
  				}
  				$db->sql_freeresult($result);
--- 3317,3321 ----
  				if ( !$db->sql_query($sql) )
  				{
! 					//mx_message_die(GENERAL_ERROR, 'Could not insert new word matches', '', __LINE__, __FILE__, $sql);
  				}
  				$db->sql_freeresult($result);