[mxbb-commits] core/admin admin_mx_smilies.php,1.9,1.10

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

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

Modified Files:
	admin_mx_smilies.php 
Log Message:
fix for phpBB3 backend (partial support)

Index: admin_mx_smilies.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** admin_mx_smilies.php	11 Jun 2008 22:24:52 -0000	1.9
--- admin_mx_smilies.php	15 Jun 2008 22:26:25 -0000	1.10
***************
*** 101,104 ****
--- 101,105 ----
  		$smiley_root_path =	$phpbb_root_path; //same here	
  		$smiley_url = 'smile_url';
+ 		$smiley_id = 'smilies_id';		
  	break;
  	case 'phpbb2':
***************
*** 106,109 ****
--- 107,111 ----
  		$smiley_root_path =	$phpbb_root_path;		
  		$smiley_url = 'smile_url';
+ 		$smiley_id = 'smilies_id';		
  	break;
  	case 'phpbb3':
***************
*** 111,114 ****
--- 113,117 ----
  		$smiley_root_path =	$phpbb_root_path;		
  		$smiley_url = 'smiley_url';
+ 		$smiley_id = 'smiley_id';		
  		$board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']);
  	break;
***************
*** 207,213 ****
  					if( !empty($replace_existing) )
  					{
! 						$sql = "UPDATE " . SMILIES_TABLE . "
! 							SET smile_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emoticon = '" . str_replace("\'", "''", $smile_data[1]) . "'
! 							WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'";
  					}
  					else
--- 210,228 ----
  					if( !empty($replace_existing) )
  					{
! 						switch (PORTAL_BACKEND)
! 						{
! 							case 'internal':
! 							case 'phpbb2':
! 								$sql = "UPDATE " . SMILIES_TABLE . "
! 									SET smile_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emoticon = '" . str_replace("\'", "''", $smile_data[1]) . "'
! 									WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'";				
! 							break;
! 
! 							case 'phpbb3':
! 								$sql = "UPDATE " . SMILIES_TABLE . "
! 									SET smiley_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emoticon = '" . str_replace("\'", "''", $smile_data[1]) . "'
! 									WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'";											
! 							break;
! 						}					
  					}
  					else
***************
*** 218,223 ****
  				else
  				{
! 					$sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon)
! 						VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')";
  				}
  
--- 233,249 ----
  				else
  				{
! 					switch (PORTAL_BACKEND)
! 					{
! 						case 'internal':
! 						case 'phpbb2':
! 							$sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon)
! 								VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')";
! 						break;
! 
! 						case 'phpbb3':
! 							$sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emoticon)
! 								VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')";									
! 						break;
! 					}	
  				}
  
***************
*** 297,301 ****
  		for($i = 0; $i < count($resultset); $i++ )
  		{
! 			$smile_pak .= $resultset[$i]['smile_url'] . $delimeter;
  			$smile_pak .= $resultset[$i]['emoticon'] . $delimeter;
  			$smile_pak .= $resultset[$i]['code'] . "\n";
--- 323,327 ----
  		for($i = 0; $i < count($resultset); $i++ )
  		{
! 			$smile_pak .= $resultset[$i][$smiley_url] . $delimeter;
  			$smile_pak .= $resultset[$i]['emoticon'] . $delimeter;
  			$smile_pak .= $resultset[$i]['code'] . "\n";
***************
*** 407,414 ****
  
  			$smiley_id = $mx_request_vars->request('id', MX_TYPE_INT);
  						
! 			$sql = "SELECT *
! 				FROM " . SMILIES_TABLE . "
! 				WHERE smilies_id = " . $smiley_id;
  			$result = $db->sql_query($sql);
  			if( !$result )
--- 433,454 ----
  
  			$smiley_id = $mx_request_vars->request('id', MX_TYPE_INT);
+ 			
+ 			switch (PORTAL_BACKEND)
+ 			{
+ 				case 'internal':
+ 				case 'phpbb2':
+ 					$sql = "SELECT *
+ 						FROM " . SMILIES_TABLE . "
+ 						WHERE smilies_id = " . $smiley_id;
+ 				break;
+ 
+ 				case 'phpbb3':
+ 					$sql = "SELECT *
+ 						FROM " . SMILIES_TABLE . "
+ 						WHERE smiley_id = " . $smiley_id;
+ 				break;
+ 			}			
  						
! 
  			$result = $db->sql_query($sql);
  			if( !$result )
***************
*** 421,425 ****
  			for( $i = 0; $i < count($smiley_images); $i++ )
  			{
! 				if( $smiley_images[$i] == $smile_data['smile_url'] )
  				{
  					$smiley_selected = "selected=\"selected\"";
--- 461,465 ----
  			for( $i = 0; $i < count($smiley_images); $i++ )
  			{
! 				if( $smiley_images[$i] == $smile_data[$smiley_url] )
  				{
  					$smiley_selected = "selected=\"selected\"";
***************
*** 496,502 ****
  			// Proceed with updating the smiley table.
  			//
! 			$sql = "UPDATE " . SMILIES_TABLE . "
! 				SET code = '" . str_replace("\'", "''", $smile_code) . "', smile_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "'
! 				WHERE smilies_id = $smile_id";
  			if( !($result = $db->sql_query($sql)) )
  			{
--- 536,555 ----
  			// Proceed with updating the smiley table.
  			//
! 			switch (PORTAL_BACKEND)
! 			{
! 				case 'internal':
! 				case 'phpbb2':
! 					$sql = "UPDATE " . SMILIES_TABLE . "
! 						SET code = '" . str_replace("\'", "''", $smile_code) . "', smile_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "'
! 						WHERE smilies_id = $smile_id";				
! 				break;
! 
! 				case 'phpbb3':
! 					$sql = "UPDATE " . SMILIES_TABLE . "
! 						SET code = '" . str_replace("\'", "''", $smile_code) . "', smiley_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "'
! 						WHERE smiley_id = $smile_id";				
! 				break;
! 			}			
! 
  			if( !($result = $db->sql_query($sql)) )
  			{
***************
*** 540,546 ****
  			// Save the data to the smiley table.
  			//
! 			$sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon)
! 				VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')";
! 			$result = $db->sql_query($sql);
  			if( !$result )
  			{
--- 593,613 ----
  			// Save the data to the smiley table.
  			//
! 			switch (PORTAL_BACKEND)
! 			{
! 				case 'internal':
! 				case 'phpbb2':
! 					$sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon)
! 						VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')";
! 					$result = $db->sql_query($sql);				
! 				break;
! 
! 				case 'phpbb3':
! 					$sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emoticon)
! 						VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')";
! 					$result = $db->sql_query($sql);								
! 				break;
! 			}			
! 
! 			
  			if( !$result )
  			{
***************
*** 610,619 ****
  			"ROW_CLASS" => $row_class,
  
! 			"SMILEY_IMG" =>  $smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'],
  			"CODE" => $smilies[$i]['code'],
  			"EMOT" => $smilies[$i]['emoticon'],
  
! 			"U_SMILEY_EDIT" => mx_append_sid("admin_mx_smilies.$phpEx?mode=edit&amp;id=" . $smilies[$i]['smilies_id']),
! 			"U_SMILEY_DELETE" => mx_append_sid("admin_mx_smilies.$phpEx?mode=delete&amp;id=" . $smilies[$i]['smilies_id']))
  		);
  	}
--- 677,686 ----
  			"ROW_CLASS" => $row_class,
  
! 			"SMILEY_IMG" =>  $smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i][$smiley_url],
  			"CODE" => $smilies[$i]['code'],
  			"EMOT" => $smilies[$i]['emoticon'],
  
! 			"U_SMILEY_EDIT" => mx_append_sid("admin_mx_smilies.$phpEx?mode=edit&amp;id=" . $smilies[$i][$smiley_id]),
! 			"U_SMILEY_DELETE" => mx_append_sid("admin_mx_smilies.$phpEx?mode=delete&amp;id=" . $smilies[$i][$smiley_id]))
  		);
  	}