[mxbb-commits] core/admin admin_mx_smilies.php,1.13,1.14

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

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

Modified Files:
	admin_mx_smilies.php 
Log Message:
mmm

Index: admin_mx_smilies.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** admin_mx_smilies.php	18 Jun 2008 16:23:59 -0000	1.13
--- admin_mx_smilies.php	18 Jun 2008 16:52:22 -0000	1.14
***************
*** 164,172 ****
  		if( !empty($clear_current)  )
  		{
! 			$sql = "DELETE
! 				FROM " . $table;
! 			if( !$result = $db->sql_query($sql) )
  			{
! 				mx_message_die(GENERAL_ERROR, "Couldn't delete current smilies", "", __LINE__, __FILE__, $sql);
  			}
  		}
--- 164,177 ----
  		if( !empty($clear_current)  )
  		{
! 			switch ($db->sql_layer)
  			{
! 				case 'sqlite':
! 				case 'firebird':
! 					$db->sql_query('DELETE FROM ' . $table);
! 				break;
! 
! 				default:
! 					$db->sql_query('TRUNCATE TABLE ' . $table);
! 				break;
  			}
  		}
***************
*** 208,211 ****
--- 213,228 ----
  				$smile_data[$j] = str_replace(">", ">", $smile_data[$j]);
  				$k = $smile_data[$j];
+ 				
+ 				// Stripslash here because it got addslashed before... (on export)
+ 				$smile_url = stripslashes($smile_data[0]);
+ 				$smiley_width = stripslashes($smile_data[1]);
+ 				$smiley_height = stripslashes($smile_data[2]);
+ 				$display_on_posting = stripslashes($smile_data[3]);
+ 
+ 				if (isset($smile_data[4]) && isset($smile_data[5]))
+ 				{
+ 					$smile_emotion = stripslashes($smile_data[4]);
+ 					$smile_code = stripslashes($smile_data[5]);
+ 				}				
  
  				if( $smiles[$k] == 1 )
***************
*** 223,229 ****
  
  							case 'phpbb3':
! 								$sql = "UPDATE " . $table . "
! 									SET smiley_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emotion = '" . str_replace("\'", "''", $smile_data[1]) . "'
! 									WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'";											
  							break;
  						}					
--- 240,255 ----
  
  							case 'phpbb3':
! 								$sql = array(
! 									'emotion'			=> $smile_emotion,					
! 									$fields . '_url'	=> $smile_url,
! 									$fields . '_height'	=> (int) $smiley_height,
! 									$fields . '_width'	=> (int) $smiley_width,
! 									$fields . '_order'	=> (int) $smiley_order,
! 									'display_on_posting'=> (int) $display_on_posting,
! 								);
! 
! 								$sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql) . "
! 									WHERE code = '" . $db->sql_escape($smile_code) . "'";
! 								$db->sql_query($sql);											
  							break;
  						}					
***************
*** 245,250 ****
  
  						case 'phpbb3':
! 							$sql = "INSERT INTO " . $table . " (code, smiley_url, emotion)
! 								VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')";									
  						break;
  					}	
--- 271,284 ----
  
  						case 'phpbb3':
! 							$sql = array(
! 								'code'				=> $smile_code,
! 								'emotion'			=> $smile_emotion,					
! 								$fields . '_url'	=> $smile_url,
! 								$fields . '_height'	=> (int) $smiley_height,
! 								$fields . '_width'	=> (int) $smiley_width,
! 								$fields . '_order'	=> (int) $smiley_order,
! 								'display_on_posting'=> (int) $display_on_posting,
! 							);
! 							$db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql));									
  						break;
  					}	
***************
*** 777,780 ****
--- 811,818 ----
  			"CODE" => $smilies[$i]['code'],
  			"EMOT" => $smilies[$i][$emotion],
+ 			
+ 			'WIDTH'		=> (PORTAL_BACKEND === 'phpbb3') ? $smilies[$i]['smiley_width'] : '',
+ 			'HEIGHT'	=> (PORTAL_BACKEND === 'phpbb3') ? $smilies[$i]['smiley_height'] : '',
+ 			'ORDER'		=> (PORTAL_BACKEND === 'phpbb3') ? $smilies[$i]['smiley_order'] + 1 : '',			
  
  			"U_SMILEY_EDIT" => mx_append_sid("admin_mx_smilies.$phpEx?mode=edit&id=" . $smilies[$i][$smiley_id]),