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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	admin_mx_smilies.php 
Log Message:
partial support for phpBB3 enabled for smilies, more will come...

Index: admin_mx_smilies.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** admin_mx_smilies.php	15 Jun 2008 22:26:25 -0000	1.10
--- admin_mx_smilies.php	18 Jun 2008 06:20:56 -0000	1.11
***************
*** 101,105 ****
  		$smiley_root_path =	$phpbb_root_path; //same here	
  		$smiley_url = 'smile_url';
! 		$smiley_id = 'smilies_id';		
  	break;
  	case 'phpbb2':
--- 101,106 ----
  		$smiley_root_path =	$phpbb_root_path; //same here	
  		$smiley_url = 'smile_url';
! 		$smiley_id = 'smilies_id';
! 		$emotion = 'emoticon';		
  	break;
  	case 'phpbb2':
***************
*** 107,111 ****
  		$smiley_root_path =	$phpbb_root_path;		
  		$smiley_url = 'smile_url';
! 		$smiley_id = 'smilies_id';		
  	break;
  	case 'phpbb3':
--- 108,113 ----
  		$smiley_root_path =	$phpbb_root_path;		
  		$smiley_url = 'smile_url';
! 		$smiley_id = 'smilies_id';
! 		$emotion = 'emoticon';		
  	break;
  	case 'phpbb3':
***************
*** 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;
--- 115,120 ----
  		$smiley_root_path =	$phpbb_root_path;		
  		$smiley_url = 'smiley_url';
! 		$smiley_id = 'smiley_id';
! 		$emotion = 'emotion';		
  		$board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']);
  	break;
***************
*** 221,225 ****
  							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;
--- 224,228 ----
  							case 'phpbb3':
  								$sql = "UPDATE " . SMILIES_TABLE . "
! 									SET smiley_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emotion = '" . str_replace("\'", "''", $smile_data[1]) . "'
  									WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'";											
  							break;
***************
*** 242,246 ****
  
  						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;
--- 245,249 ----
  
  						case 'phpbb3':
! 							$sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emotion)
  								VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')";									
  						break;
***************
*** 324,328 ****
  		{
  			$smile_pak .= $resultset[$i][$smiley_url] . $delimeter;
! 			$smile_pak .= $resultset[$i]['emoticon'] . $delimeter;
  			$smile_pak .= $resultset[$i]['code'] . "\n";
  		}
--- 327,331 ----
  		{
  			$smile_pak .= $resultset[$i][$smiley_url] . $delimeter;
! 			$smile_pak .= $resultset[$i][$emotion] . $delimeter;
  			$smile_pak .= $resultset[$i]['code'] . "\n";
  		}
***************
*** 454,458 ****
  			if( !$result )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not obtain emoticon information', "", __LINE__, __FILE__, $sql);
  			}
  			$smile_data = $db->sql_fetchrow($result);
--- 457,461 ----
  			if( !$result )
  			{
! 				mx_message_die(GENERAL_ERROR, 'Could not obtain ' . $emotion . ' information', "", __LINE__, __FILE__, $sql);
  			}
  			$smile_data = $db->sql_fetchrow($result);
***************
*** 482,486 ****
  			$template->assign_vars(array(
  				"SMILEY_CODE" => $smile_data['code'],
! 				"SMILEY_EMOTICON" => $smile_data['emoticon'],
  
  				"L_SMILEY_TITLE" => $lang['smiley_title'],
--- 485,489 ----
  			$template->assign_vars(array(
  				"SMILEY_CODE" => $smile_data['code'],
! 				"SMILEY_EMOTICON" => $smile_data[$emotion],
  
  				"L_SMILEY_TITLE" => $lang['smiley_title'],
***************
*** 547,551 ****
  				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;
--- 550,554 ----
  				case 'phpbb3':
  					$sql = "UPDATE " . SMILIES_TABLE . "
! 						SET code = '" . str_replace("\'", "''", $smile_code) . "', smiley_url = '" . str_replace("\'", "''", $smile_url) . "', emotion = '" . str_replace("\'", "''", $smile_emotion) . "'
  						WHERE smiley_id = $smile_id";				
  				break;
***************
*** 603,607 ****
  
  				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);								
--- 606,610 ----
  
  				case 'phpbb3':
! 					$sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emotion)
  						VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')";
  					$result = $db->sql_query($sql);								
***************
*** 679,683 ****
  			"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]),
--- 682,686 ----
  			"SMILEY_IMG" =>  $smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i][$smiley_url],
  			"CODE" => $smilies[$i]['code'],
! 			"EMOT" => $smilies[$i][$emotion],
  
  			"U_SMILEY_EDIT" => mx_append_sid("admin_mx_smilies.$phpEx?mode=edit&amp;id=" . $smilies[$i][$smiley_id]),