[mxbb-commits] core/includes mx_functions.php, 1.90, 1.91 mx_functions_admincp.php, 1.58, 1.59

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

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

Modified Files:
	mx_functions.php mx_functions_admincp.php 
Log Message:
ready :)

Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** mx_functions_admincp.php	20 Jul 2008 04:23:56 -0000	1.58
--- mx_functions_admincp.php	19 Aug 2008 14:34:58 -0000	1.59
***************
*** 304,313 ****
  						SELECT " . $next_id . ", parameter_id,   parameter_default
  							FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $function_id;
! 
  					if( !($result = $db->sql_query($sql)) )
  					{
  						mx_message_die(GENERAL_ERROR, "Couldn't insert parameter information", "", __LINE__, __FILE__, $sql);
  					}
! 
  					//
  					// Update cache
--- 304,330 ----
  						SELECT " . $next_id . ", parameter_id,   parameter_default
  							FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $function_id;
! 							
  					if( !($result = $db->sql_query($sql)) )
  					{
  						mx_message_die(GENERAL_ERROR, "Couldn't insert parameter information", "", __LINE__, __FILE__, $sql);
  					}
! 					/*
! 					$sql = "SELECT " . $next_id . ", parameter_id,   parameter_default
! 							FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $function_id;
! 					if( !($result = $db->sql_query($sql)) )
! 					{
! 						mx_message_die(GENERAL_ERROR, "Couldn't insert row in blocks table", "", __LINE__, __FILE__, $sql);
! 					}
! 					$row = $db->sql_fetchrow($result);
! 					
! 					$sql = array(					
! 						'block_id'	=> (int) $row['block_id'],
! 						'parameter_id'	=> (int) $row['parameter_id'],
! 						'parameter_value'	=> $row['parameter_value'],
! 					);							
! 	
! 					$result = $db->sql_query("INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . $db->sql_build_array('INSERT', $sql));						
! 					*/
! 					
  					//
  					// Update cache
***************
*** 2216,2226 ****
  
  				if( $count == 0 )
! 				{
  					$sql_add = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . "( block_id, parameter_id, parameter_value )
  						SELECT " . $block_id . ", " . $sys_param_rows[$p]['parameter_id'] . ", parameter_default
  							FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $function_id . " AND parameter_id = " . $sys_param_rows[$p]['parameter_id'];
! 
! 					$result_add = $db->sql_query($sql_add);
! 
  					$output_message .= '<br /> + (' . $sys_param_rows[$p]['parameter_name'] . ', ' . $sys_param_rows[$p]['parameter_id'] . ', ' . $block_id . '),';
  					$output_message .= !$result_add ? '<br /><b><font color=#0000ff>[db...error]</font></b> line: ' . __LINE__ . ' , ' . $sql_add . '<br />' : '';
--- 2233,2259 ----
  
  				if( $count == 0 )
! 				{				
  					$sql_add = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . "( block_id, parameter_id, parameter_value )
  						SELECT " . $block_id . ", " . $sys_param_rows[$p]['parameter_id'] . ", parameter_default
  							FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $function_id . " AND parameter_id = " . $sys_param_rows[$p]['parameter_id'];
! 					/*
! 					$sql = "SELECT " . $block_id . ", " . $sys_param_rows[$p]['parameter_id'] . ", parameter_default
! 							FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $function_id . " AND parameter_id = " . $sys_param_rows[$p]['parameter_id'];
! 					if( !($result = $db->sql_query($sql)) )
! 					{
! 						mx_message_die(GENERAL_ERROR, "Couldn't insert row in blocks table", "", __LINE__, __FILE__, $sql);
! 					}
! 					while($row = $db->sql_fetchrow($result))
! 					{					
! 						$sql_array = array(					
! 							'block_id'	=> (int) $block_id,
! 							'parameter_id'	=> (int) $sys_param_rows[$p]['parameter_id'],
! 							'parameter_value'	=> $row['parameter_value'],
! 						);
! 					}
! 					$sql_add = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . $db->sql_build_array('INSERT', $sql_array);					
! 					*/
! 					$result_add = $db->sql_query($sql_add);					
! 					
  					$output_message .= '<br /> + (' . $sys_param_rows[$p]['parameter_name'] . ', ' . $sys_param_rows[$p]['parameter_id'] . ', ' . $block_id . '),';
  					$output_message .= !$result_add ? '<br /><b><font color=#0000ff>[db...error]</font></b> line: ' . __LINE__ . ' , ' . $sql_add . '<br />' : '';