4 files changed, 383 insertions, 396 deletions
diff --git a/phpBB/admin/admin_smilies.php b/phpBB/admin/admin_smilies.php
index cde8ed250d..d48474b22d 100644
--- a/phpBB/admin/admin_smilies.php
+++ b/phpBB/admin/admin_smilies.php
@@ -38,12 +38,17 @@ if($setmodules == 1)
 // Load default header
 //
 $phpbb_root_dir = "./../";
-if( $HTTP_GET_VARS['mode'] == 'export' && $HTTP_GET_VARS['send_file'] == 1 )
+
+if( isset($HTTP_GET_VARS['export_pack']) )
 {
-	$no_page_header = 1;
+	if ( $HTTP_GET_VARS['export_pack'] == "send" )
+	{	
+		$no_page_header = true;
+	}
 }
 require('pagestart.inc');
-$delimeter  = '=+:';
+
+
 //
 // Check to see what mode we should operate in.
 //
@@ -56,6 +61,8 @@ else
 	$mode = "";
 }
 
+$delimeter  = '=+:';
+
 //
 // Read a listing of uploaded smilies for use in the add or edit smliey code...
 //
@@ -81,454 +88,432 @@ while($file = @readdir($dir))
 //
 // Select main mode
 //
-switch($mode)
+if( isset($HTTP_GET_VARS['import_pack']) || isset($HTTP_POST_VARS['import_pack']) )
 {
-	case 'import':
+	//
+	// Import a list a "Smiley Pack"
+	//
+	$smile_pak = ( isset($HTTP_POST_VARS['smile_pak']) ) ? $HTTP_POST_VARS['smile_pak'] : $HTTP_GET_VARS['smile_pak'];
+	$clear_current = ( isset($HTTP_POST_VARS['clear_current']) ) ? $HTTP_POST_VARS['clear_current'] : $HTTP_GET_VARS['clear_current'];
+	$replace_existing = ( isset($HTTP_POST_VARS['replace']) ) ? $HTTP_POST_VARS['replace'] : $HTTP_GET_VARS['replace'];
+
+	if ( !empty($smile_pak) )
+	{
 		//
-		// Import a list a "Smiley Pack"
+		// The user has already selected a smile_pak file.. Import it.
 		//
-		$smile_pak = ( !empty($HTTP_POST_VARS['smile_pak']) ) ? $HTTP_POST_VARS['smile_pak'] : $HTTP_GET_VARS['smile_pak'];
-		$clear_current = ( !empty($HTTP_POST_VARS['clear_current']) ) ? $HTTP_POST_VARS['clear_current'] : $HTTP_GET_VARS['clear_current'];
-		$replace_existing = ( ! empty($HTTP_POST_VARS['replace']) ) ? $HTTP_POST_VARS['replace'] : $HTTP_GET_VARS['replace'];
-		if ( !empty($smile_pak) )
+		if( !empty($clear_current)  )
 		{
-			//
-			// The user has already selected a smile_pak file.. Import it.
-			//
-			if( $clear_current == 'Y' )
+			$sql = "DELETE 
+				FROM " . SMILIES_TABLE;
+			if( !$result = $db->sql_query($sql) )
 			{
-				$sql = "DELETE FROM " . SMILIES_TABLE;
-				$result = $db->sql_query($sql);
-				if( !$result )
-		      {
-    		     message_die(GENERAL_ERROR, "Couldn't delete current smilies", "", __LINE__, __FILE__, $sql);
-      		}
-
+				message_die(GENERAL_ERROR, "Couldn't delete current smilies", "", __LINE__, __FILE__, $sql);
 			}
-			else
+		}
+		else
+		{
+			$sql = "SELECT code 
+				FROM ". SMILIES_TABLE;
+			if( !$result = $db->sql_query($sql) )
 			{
-				$sql = "SELECT code FROM ". SMILIES_TABLE;
-				$result = $db->sql_query($sql);
-				if( !$result )
-     			{
-		         message_die(GENERAL_ERROR, "Couldn't get current smilies", "", __LINE__, __FILE__, $sql);
-      		}
-
-				$cur_smilies = $db->sql_fetchrowset($result);
-				for( $i = 0; $i < count($cur_smilies); $i++ )
-				{
-					$k = $cur_smilies[$i]['code'];
-					$smiles[$k] = 1;
-				}
+				message_die(GENERAL_ERROR, "Couldn't get current smilies", "", __LINE__, __FILE__, $sql);
 			}
-			$fcontents = @file($phpbb_root_path . $board_config['smilies_path'] . '/'. $smile_pak);
-			if( empty($fcontents) )
+
+			$cur_smilies = $db->sql_fetchrowset($result);
+
+			for( $i = 0; $i < count($cur_smilies); $i++ )
 			{
-				message_die(GENERAL_ERROR, "Couldn't read smiley pak file", "", __LINE__, __FILE__, $sql);
+				$k = $cur_smilies[$i]['code'];
+				$smiles[$k] = 1;
 			}
-			for( $i = 0; $i < count($fcontents); $i++ )
+		}
+
+		$fcontents = @file($phpbb_root_path . $board_config['smilies_path'] . '/'. $smile_pak);
+
+		if( empty($fcontents) )
+		{
+			message_die(GENERAL_ERROR, "Couldn't read smiley pak file", "", __LINE__, __FILE__, $sql);
+		}
+
+		for( $i = 0; $i < count($fcontents); $i++ )
+		{
+			$smile_data = explode($delimeter, trim(addslashes($fcontents[$i])));
+
+			for( $j = 2; $j < count($smile_data); $j++)
 			{
-				if( !get_magic_quotes_runtime() )
-				{
-					$fcontents[$i] = addslashes($fcontents[$i]);
-				}
-				$smile_data = explode($delimeter, trim($fcontents[$i]));
-				for( $j = 2; $j < count($smile_data); $j++)
+				$k = $smile_data[$j];
+
+				if( $smiles[$k] == 1 )
 				{
-					$k = $smile_data[$j];
-					if( $smiles[$k] == 1 )
+					if( !empty($replace_existing) )
 					{
-						if( $replace_existing == 'Y' )
-						{
-							$sql = "UPDATE " . SMILIES_TABLE . " 
-										SET smile_url = '$smile_data[0]',
-											emoticon = '$smile_data[1]'
-										WHERE code = '$smile_data[$j]'";
-							
-						}
-						else
-						{
-							$sql = '';
-						}
+						$sql = "UPDATE " . SMILIES_TABLE . " 
+									SET smile_url = '$smile_data[0]',
+										emoticon = '$smile_data[1]'
+									WHERE code = '$smile_data[$j]'";
+						
 					}
 					else
 					{
-						$sql = "INSERT INTO " . SMILIES_TABLE . " (
-										code,
-										smile_url,
-										emoticon )
-									VALUES(
-										'$smile_data[$j]',
-										'$smile_data[0]',
-										'$smile_data[1]')";
-							
-					}
-					if( $sql != '' )
-					{
-						$result = $db->sql_query($sql);
-						if( !$result )
-				      {
-         				message_die(GENERAL_ERROR, "Couldn't update smilies!", "", __LINE__, __FILE__, $sql);
-      				}
-
+						$sql = '';
 					}
 				}
-			}
-			//
-			// Ok the smilies have been imported do something...
-			//
-			$template->set_filenames(array(
-				"body" => "admin/admin_message_body.tpl")
-			);
-			$template->assign_vars(array(
-				"MESSAGE_TITLE" => $lang['smiley_title'],
-				"MESSAGE_TEXT" => $lang['smiley_import_success'])
-			);
-			$template->pparse("body");
-			
-		}
-		else
-		{
-			//
-			// Display the script to get the smile_pak cfg file...
-			//
-			$smile_paks_select = "<SELECT NAME='smile_pak'><option value=''>".$lang['Select_pak']."</option>";
-			while( list($key, $value) = each($smiley_paks) )
-			{
-				if ( !empty($value) ) 
+				else
 				{
-					$smile_paks_select .= "<option>".$value."</option>";
+					$sql = "INSERT INTO " . SMILIES_TABLE . " (
+									code,
+									smile_url,
+									emoticon )
+								VALUES(
+									'$smile_data[$j]',
+									'$smile_data[0]',
+									'$smile_data[1]')";
+						
+				}
+
+				if( $sql != '' )
+				{
+					$result = $db->sql_query($sql);
+					if( !$result )
+					{
+						message_die(GENERAL_ERROR, "Couldn't update smilies!", "", __LINE__, __FILE__, $sql);
+					}
 				}
 			}
-			$smile_paks_select .= "</select>";
-			$replace_opt = "<input type='radio' name='replace' value='Y'>&nbsp;".$lang['replace_existing'];
-			$keep_opt = "<input type='radio' name='replace' value='N'>&nbsp;".$lang['keep_existing'];
-			$del_exist = "<input type='checkbox' name='clear_current' value='Y'>";
-			$hidden_vars = "<input type='hidden' name='mode' value='import'>";	
-			$template->set_filenames(array(
-				"body" => "admin/smile_import_body.tpl")
-			);
-			$template->assign_vars(array(
-				"S_SMILEY_ACTION" => $PHPSELF,
-				"L_SMILEY_TITLE" => $lang['smiley_title'],
-				"L_SMILEY_EXPLAIN" => $lang['smiley_import_inst'],
-				"L_SMILEY_IMPORT" => $lang['smiley_import'],
-				"L_SELECT_LBL" => $lang['choose_smile_pak'],
-				"S_SMILE_SELECT" => $smile_paks_select,
-				"L_IMPORT" => $lang['import'],
-				"L_CONFLICTS" => $lang['smile_conflicts'],
-				"S_REPLACE_OPT" => $replace_opt,
-				"S_KEEP_OPT" => $keep_opt,
-				"L_DEL_EXISTING" => $lang['del_existing_smileys'],
-				"S_DEL_EXISTING" => $del_exist,
-				"S_HIDDEN_FIELDS" => $hidden_vars)
-			);
-			$template->pparse("body");
 		}
-		break;
+
+		$message = $lang['smiley_import_success'] . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . append_sid("admin_smilies.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
+
+		message_die(GENERAL_MESSAGE, $message);
 		
-	case 'export':
+	}
+	else
+	{
 		//
-		// Export our smiley config as a smiley pak...
+		// Display the script to get the smile_pak cfg file...
 		//
-		if ( $send_file == 1 )
-		{	
-			$smile_pak = '';
-			$sql = "SELECT * FROM " . SMILIES_TABLE;
-			$result = $db->sql_query($sql);
-			if( !$result )
-	      {
-  		   	message_die(GENERAL_ERROR, "Couldn't delete smiley", "", __LINE__, __FILE__, $sql);
-      	}
-
-			$resultset = $db->sql_fetchrowset($result);
-			for($i = 0; $i < count($resultset); $i++ )
+		$smile_paks_select = "<select name='smile_pak'><option value=''>" . $lang['Select_pak'] . "</option>";
+		while( list($key, $value) = @each($smiley_paks) )
+		{
+			if ( !empty($value) ) 
 			{
-				$smile_pak .= $resultset[$i]['smile_url'] . $delimeter;
-				$smile_pak .= $resultset[$i]['emoticon'] . $delimeter;
-				$smile_pak .= $resultset[$i]['code'] . "\n";
+				$smile_paks_select .= "<option>" . $value . "</option>";
 			}
-			header("Content-Type: text/x-delimtext; name=\"smiles.pak\"");
-			header("Content-disposition: attachment; filename=smiles.pak");
-			echo $smile_pak;
-			exit;
 		}
+		$smile_paks_select .= "</select>";
+
+		$hidden_vars = "<input type='hidden' name='mode' value='import'>";	
+
 		$template->set_filenames(array(
-			"body" => "admin/admin_message_body.tpl")
+			"body" => "admin/smile_import_body.tpl")
 		);
 
 		$template->assign_vars(array(
-			"MESSAGE_TITLE" => $lang['smiley_title'],
-			"MESSAGE_TEXT" => $lang['export_smiles'])
-		);
-		$template->pparse('body');
-		
-		break;
-		
-	case 'delete':
-		//
-		// Admin has selected to delete a smiley.
-		//
+			"L_SMILEY_TITLE" => $lang['smiley_title'],
+			"L_SMILEY_EXPLAIN" => $lang['smiley_import_inst'],
+			"L_SMILEY_IMPORT" => $lang['smiley_import'],
+			"L_SELECT_LBL" => $lang['choose_smile_pak'],
+			"L_IMPORT" => $lang['import'],
+			"L_CONFLICTS" => $lang['smile_conflicts'],
+			"L_DEL_EXISTING" => $lang['del_existing_smileys'], 
+			"L_REPLACE_EXISTING" => $lang['replace_existing'], 
+			"L_KEEP_EXISTING" => $lang['keep_existing'], 
 
-		$smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
+			"S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"),
+			"S_SMILE_SELECT" => $smile_paks_select,
+			"S_HIDDEN_FIELDS" => $hidden_vars)
+		);
 
-		$sql = "DELETE FROM " . SMILIES_TABLE . "
-			WHERE smilies_id = " . $smiley_id;
-		$result = $db->sql_query($sql);
-		if( !$result )
+		$template->pparse("body");
+	}
+}
+else if( isset($HTTP_GET_VARS['export_pack']) )
+{
+	//
+	// Export our smiley config as a smiley pak...
+	//
+	if ( $HTTP_GET_VARS['export_pack'] == "send" )
+	{	
+		$sql = "SELECT * 
+			FROM " . SMILIES_TABLE;
+		if( !$result = $db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, "Couldn't delete smiley", "", __LINE__, __FILE__, $sql);
 		}
 
-		$template->set_filenames(array(
-			"body" => "admin/admin_message_body.tpl")
-		);
+		$resultset = $db->sql_fetchrowset($result);
 
-		$template->assign_vars(array(
-			"MESSAGE_TITLE" => $lang['smiley_title'],
-			"MESSAGE_TEXT" => $lang['smiley_del_success'])
-		);
-		$template->pparse("body");
-		break;
+		$smile_pak = "";
+		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";
+		}
 
-	case 'edit':
-		//
-		// Admin has selected to edit a smiley.
-		//
+		header("Content-Type: text/x-delimtext; name=\"smiles.pak\"");
+		header("Content-disposition: attachment; filename=smiles.pak");
 
-		$smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
+		echo $smile_pak;
 
-		$sql = "SELECT *
-			FROM " . SMILIES_TABLE . "
-			WHERE smilies_id = " . $smiley_id;
-		$result = $db->sql_query($sql);
-		if( !$result )
-		{
-			message_die(GENERAL_ERROR, $lang['smile_edit_err'], "", __LINE__, __FILE__, $sql);
-		}
-		$smile_data = $db->sql_fetchrow($result);
+		exit;
+	}
 
-		$filename_list = "";
-		for( $i = 0; $i < count($smiley_images); $i++ )
-		{
-			if( $smiley_images[$i] == $smile_data['smile_url'] )
-			{
-				$smiley_selected = "selected=\"selected\"";
-				$smiley_edit_img = $smiley_images[$i];
-			}
-			else
-			{
-				$smiley_selected = "";
-			}
+	$message = sprintf($lang['export_smiles'], "<a href=\"" . append_sid("admin_smilies.$phpEx?export_pack=send", true) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . append_sid("admin_smilies.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
 
-			$filename_list .= '<option value="' . $smiley_images[$i] . '"' . $smiley_selected . '>' . $smiley_images[$i] . '</option>';
-		}
+	message_die(GENERAL_MESSAGE, $message);
 
-		$template->set_filenames(array(
-			"body" => "admin/smile_edit_body.tpl")
-		);
+}
+else if( isset($HTTP_GET_VARS['add']) )
+{
+	//
+	// Admin has selected to add a smiley.
+	//
 
-		$s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="smile_id" value="' . $smile_data['smilies_id'] . '" />';
+	$template->set_filenames(array(
+		"body" => "admin/smile_edit_body.tpl")
+	);
 
-		$template->assign_vars(array(
-			"SMILEY_CODE" => $smile_data['code'],
-			"SMILEY_EMOTICON" => $smile_data['emoticon'],
+	$filename_list = "";
+	for( $i = 0; $i < count($smiley_images); $i++ )
+	{
+		$filename_list .= '<option value="' . $smiley_images[$i] . '">' . $smiley_images[$i] . '</option>';
+	}
 
-			"L_SMILEY_TITLE" => $lang['smiley_title'],
-			"L_SMILEY_CONFIG" => $lang['smiley_config'],
-			"L_SMILEY_EXPLAIN" => $lang['smile_desc'],
-			"L_SMILEY_CODE" => $lang['smiley_code'],
-			"L_SMILEY_URL" => $lang['smiley_url'],
-			"L_SMILEY_EMOTION" => $lang['smiley_emot'],
-			"L_SUBMIT" => $lang['Submit_changes'],
-			"L_RESET" => $lang['Reset_changes'],
+	$s_hidden_fields = '<input type="hidden" name="mode" value="savenew" />';
 
-			"SMILEY_IMG" => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smiley_edit_img, 
+	$template->assign_vars(array(
+		"L_SMILEY_TITLE" => $lang['smiley_title'],
+		"L_SMILEY_CONFIG" => $lang['smiley_config'],
+		"L_SMILEY_EXPLAIN" => $lang['smiley_instr'],
+		"L_SMILEY_CODE" => $lang['smiley_code'],
+		"L_SMILEY_URL" => $lang['smiley_url'],
+		"L_SMILEY_EMOTION" => $lang['smiley_emot'],
+		"L_SUBMIT" => $lang['Submit'],
+		"L_RESET" => $lang['Reset'],
 
-			"S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"),
-			"S_HIDDEN_FIELDS" => $s_hidden_fields, 
-			"S_FILENAME_OPTIONS" => $filename_list, 
-			"S_SMILEY_BASEDIR" => $phpbb_root_path . $board_config['smilies_path'])
-		);
+		"SMILEY_IMG" => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smiley_images[0], 
 
-		$template->pparse("body");
-		break;
+		"S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"), 
+		"S_HIDDEN_FIELDS" => $s_hidden_fields, 
+		"S_FILENAME_OPTIONS" => $filename_list, 
+		"S_SMILEY_BASEDIR" => $phpbb_root_path . $board_config['smilies_path'])
+	);
 
-	case "add":
-		//
-		// Admin has selected to add a smiley.
-		//
+	$template->pparse("body");
+}
+else if ( $mode != "" )
+{
+	switch( $mode )
+	{
+		case 'delete':
+			//
+			// Admin has selected to delete a smiley.
+			//
 
-		$template->set_filenames(array(
-			"body" => "admin/smile_edit_body.tpl")
-		);
+			$smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
 
-		$filename_list = "";
-		for( $i = 0; $i < count($smiley_images); $i++ )
-		{
-			$filename_list .= '<option value="' . $smiley_images[$i] . '">' . $smiley_images[$i] . '</option>';
-		}
+			$sql = "DELETE FROM " . SMILIES_TABLE . "
+				WHERE smilies_id = " . $smiley_id;
+			$result = $db->sql_query($sql);
+			if( !$result )
+			{
+				message_die(GENERAL_ERROR, "Couldn't delete smiley", "", __LINE__, __FILE__, $sql);
+			}
 
-		$s_hidden_fields = '<input type="hidden" name="mode" value="savenew" />';
+			$message = $lang['smiley_del_success'] . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . append_sid("admin_smilies.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
 
-		$template->assign_vars(array(
-			"L_SMILEY_TITLE" => $lang['smiley_title'],
-			"L_SMILEY_CONFIG" => $lang['smiley_config'],
-			"L_SMILEY_EXPLAIN" => $lang['smiley_instr'],
-			"L_SMILEY_CODE" => $lang['smiley_code'],
-			"L_SMILEY_URL" => $lang['smiley_url'],
-			"L_SMILEY_EMOTION" => $lang['smiley_emot'],
-			"L_SUBMIT" => $lang['Submit_changes'],
-			"L_RESET" => $lang['Reset_changes'],
-
-			"SMILEY_IMG" => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smiley_images[0], 
-
-			"S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"), 
-			"S_HIDDEN_FIELDS" => $s_hidden_fields, 
-			"S_FILENAME_OPTIONS" => $filename_list, 
-			"S_SMILEY_BASEDIR" => $phpbb_root_path . $board_config['smilies_path'])
-		);
+			message_die(GENERAL_MESSAGE, $message);
+			break;
 
-		$template->pparse("body");
-		break;
+		case 'edit':
+			//
+			// Admin has selected to edit a smiley.
+			//
 
-	case "save":
-		//
-		// Admin has submitted changes while editing a smiley.
-		//
+			$smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id'];
 
-		//
-		// Get the submitted data, being careful to ensure that we only
-		// accept the data we are looking for.
-		//
-		$smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? $HTTP_POST_VARS['smile_code'] : $HTTP_GET_VARS['smile_code'];
-		$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];
-		$smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? $HTTP_POST_VARS['smile_emotion'] : $HTTP_GET_VARS['smile_emotion'];
-		$smile_id = ( isset($HTTP_POST_VARS['smile_id']) ) ? intval($HTTP_POST_VARS['smile_id']) : intval($HTTP_GET_VARS['smile_id']);
+			$sql = "SELECT *
+				FROM " . SMILIES_TABLE . "
+				WHERE smilies_id = " . $smiley_id;
+			$result = $db->sql_query($sql);
+			if( !$result )
+			{
+				message_die(GENERAL_ERROR, $lang['smile_edit_err'], "", __LINE__, __FILE__, $sql);
+			}
+			$smile_data = $db->sql_fetchrow($result);
 
-		//
-		// Proceed with updating the smiley table.
-		//
-		$sql = "UPDATE " . SMILIES_TABLE . "
-			SET code = '$smile_code', smile_url = '$smile_url', emoticon = '$smile_emotion'
-			WHERE smilies_id = $smile_id";
-		$result = $db->sql_query($sql);
-		if( !$result )
-		{
-			message_die(GENERAL_ERROR, "Couldn't update smilies info", "", __LINE__, __FILE__, $sql);
-		}
+			$filename_list = "";
+			for( $i = 0; $i < count($smiley_images); $i++ )
+			{
+				if( $smiley_images[$i] == $smile_data['smile_url'] )
+				{
+					$smiley_selected = "selected=\"selected\"";
+					$smiley_edit_img = $smiley_images[$i];
+				}
+				else
+				{
+					$smiley_selected = "";
+				}
 
-		$template->set_filenames(array(
-			"body" => "admin/admin_message_body.tpl")
-		);
+				$filename_list .= '<option value="' . $smiley_images[$i] . '"' . $smiley_selected . '>' . $smiley_images[$i] . '</option>';
+			}
 
-		$template->assign_vars(array(
-			"MESSAGE_TITLE" => $lang['smiley_title'],
-			"MESSAGE_TEXT" => $lang['smiley_edit_success'])
-		);
-		$template->pparse("body");
-		break;
+			$template->set_filenames(array(
+				"body" => "admin/smile_edit_body.tpl")
+			);
 
-	case "savenew":
-		//
-		// Admin has submitted changes while adding a new smiley.
-		//
+			$s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="smile_id" value="' . $smile_data['smilies_id'] . '" />';
 
-		//
-		// Get the submitted data being careful to ensure the the data
-		// we recieve and process is only the data we are looking for.
-		//
-		$smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? $HTTP_POST_VARS['smile_code'] : $HTTP_GET_VARS['smile_code'];
-		$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];
-		$smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? $HTTP_POST_VARS['smile_emotion'] : $HTTP_GET_VARS['smile_emotion'];
+			$template->assign_vars(array(
+				"SMILEY_CODE" => $smile_data['code'],
+				"SMILEY_EMOTICON" => $smile_data['emoticon'],
 
-		//
-		// Save the data to the smiley table.
-		//
-		$sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon)
-			VALUES ('$smile_code', '$smile_url', '$smile_emotion')";
-		$result = $db->sql_query($sql);
-		if( !$result )
-		{
-			message_die(GENERAL_ERROR, "Couldn't insert new smiley", "", __LINE__, __FILE__, $sql);
-		}
+				"L_SMILEY_TITLE" => $lang['smiley_title'],
+				"L_SMILEY_CONFIG" => $lang['smiley_config'],
+				"L_SMILEY_EXPLAIN" => $lang['smile_desc'],
+				"L_SMILEY_CODE" => $lang['smiley_code'],
+				"L_SMILEY_URL" => $lang['smiley_url'],
+				"L_SMILEY_EMOTION" => $lang['smiley_emot'],
+				"L_SUBMIT" => $lang['Submit'],
+				"L_RESET" => $lang['Reset'],
+
+				"SMILEY_IMG" => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smiley_edit_img, 
+
+				"S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"),
+				"S_HIDDEN_FIELDS" => $s_hidden_fields, 
+				"S_FILENAME_OPTIONS" => $filename_list, 
+				"S_SMILEY_BASEDIR" => $phpbb_root_path . $board_config['smilies_path'])
+			);
 
-		$template->set_filenames(array(
-			"body" => "admin/admin_message_body.tpl")
-		);
+			$template->pparse("body");
+			break;
 
-		$template->assign_vars(array(
-			"MESSAGE_TITLE" => $lang['smiley_title'],
-			"MESSAGE_TEXT" => $lang['smiley_add_success'])
-		);
-		$template->pparse("body");
-		break;
+		case "save":
+			//
+			// Admin has submitted changes while editing a smiley.
+			//
 
-	default:
-		//
-		// This is the main display of the page before the admin has selected
-		// any options.
-		//
-		$sql = "SELECT *
-			FROM " . SMILIES_TABLE;
-		$result = $db->sql_query($sql);
-		if( !$result )
-		{
-			message_die(GENERAL_ERROR, "Couldn't obtain smileys from database", "", __LINE__, __FILE__, $sql);
-		}
+			//
+			// Get the submitted data, being careful to ensure that we only
+			// accept the data we are looking for.
+			//
+			$smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? $HTTP_POST_VARS['smile_code'] : $HTTP_GET_VARS['smile_code'];
+			$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];
+			$smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? $HTTP_POST_VARS['smile_emotion'] : $HTTP_GET_VARS['smile_emotion'];
+			$smile_id = ( isset($HTTP_POST_VARS['smile_id']) ) ? intval($HTTP_POST_VARS['smile_id']) : intval($HTTP_GET_VARS['smile_id']);
 
-		$smilies = $db->sql_fetchrowset($result);
+			//
+			// Proceed with updating the smiley table.
+			//
+			$sql = "UPDATE " . SMILIES_TABLE . "
+				SET code = '$smile_code', smile_url = '$smile_url', emoticon = '$smile_emotion'
+				WHERE smilies_id = $smile_id";
+			$result = $db->sql_query($sql);
+			if( !$result )
+			{
+				message_die(GENERAL_ERROR, "Couldn't update smilies info", "", __LINE__, __FILE__, $sql);
+			}
 
-		$template->set_filenames(array(
-			"body" => "admin/smile_list_body.tpl")
-		);
+			$message = $lang['smiley_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . append_sid("admin_smilies.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
 
-		$s_hidden_fields = '<input type="hidden" name="mode" value="add">';
-		$s_import = '<a href="' . $PHPSELF . '?mode=import"><input type="button" value="'. $lang['import_smile_pack'] . '"></a>';
-		$s_export = '<a href="' . $PHPSELF . '?mode=export"><input type="button" value="'. $lang['export_smile_pack'] . '"></a>';
-		$template->assign_vars(array(
-			"L_ACTION" => $lang['Action'],
-			"L_SMILEY_TITLE" => $lang['smiley_title'],
-			"L_SMILEY_TEXT" => $lang['smile_desc'],
-			"L_DELETE" => $lang['Delete'],
-			"L_EDIT" => $lang['Edit'],
-			"L_SMILEY_ADD" => $lang['smile_add'],
-			"L_CODE" => $lang['Code'],
-			"L_EMOT" => $lang['Emotion'],
-			"L_SMILE" => $lang['Smile'],
+			message_die(GENERAL_MESSAGE, $message);
+			break;
+
+		case "savenew":
+			//
+			// Admin has submitted changes while adding a new smiley.
+			//
+
+			//
+			// Get the submitted data being careful to ensure the the data
+			// we recieve and process is only the data we are looking for.
+			//
+			$smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? $HTTP_POST_VARS['smile_code'] : $HTTP_GET_VARS['smile_code'];
+			$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];
+			$smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? $HTTP_POST_VARS['smile_emotion'] : $HTTP_GET_VARS['smile_emotion'];
+
+			//
+			// Save the data to the smiley table.
+			//
+			$sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon)
+				VALUES ('$smile_code', '$smile_url', '$smile_emotion')";
+			$result = $db->sql_query($sql);
+			if( !$result )
+			{
+				message_die(GENERAL_ERROR, "Couldn't insert new smiley", "", __LINE__, __FILE__, $sql);
+			}
+
+			$message = $lang['smiley_add_success'] . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . append_sid("admin_smilies.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
+
+			message_die(GENERAL_MESSAGE, $message);
+			break;
+	}
+}
+else
+{
+
+	//
+	// This is the main display of the page before the admin has selected
+	// any options.
+	//
+	$sql = "SELECT *
+		FROM " . SMILIES_TABLE;
+	$result = $db->sql_query($sql);
+	if( !$result )
+	{
+		message_die(GENERAL_ERROR, "Couldn't obtain smileys from database", "", __LINE__, __FILE__, $sql);
+	}
+
+	$smilies = $db->sql_fetchrowset($result);
+
+	$template->set_filenames(array(
+		"body" => "admin/smile_list_body.tpl")
+	);
+
+	$template->assign_vars(array(
+		"L_ACTION" => $lang['Action'],
+		"L_SMILEY_TITLE" => $lang['smiley_title'],
+		"L_SMILEY_TEXT" => $lang['smile_desc'],
+		"L_DELETE" => $lang['Delete'],
+		"L_EDIT" => $lang['Edit'],
+		"L_SMILEY_ADD" => $lang['smile_add'],
+		"L_CODE" => $lang['Code'],
+		"L_EMOT" => $lang['Emotion'],
+		"L_SMILE" => $lang['Smile'],
+		"L_IMPORT_PACK" => $lang['import_smile_pack'],
+		"L_EXPORT_PACK" => $lang['export_smile_pack'],
+		
+		"S_HIDDEN_FIELDS" => $s_hidden_fields, 
+		"S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"))
+	);
+
+	//
+	// Loop throuh the rows of smilies setting block vars for the template.
+	//
+	for($i = 0; $i < count($smilies); $i++)
+	{
+		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
+		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
+
+		$template->assign_block_vars("smiles", array(
+			"ROW_COLOR" => "#" . $row_color,
+			"ROW_CLASS" => $row_class,
+
+			"SMILEY_IMG" =>  $phpbb_root_path . $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'], 
+			"CODE" => $smilies[$i]['code'],
+			"EMOT" => $smilies[$i]['emoticon'],
 			
-			"S_HIDDEN_FIELDS" => $s_hidden_fields, 
-			"S_IMPORT" => $s_import,
-			"S_EXPORT" => $s_export,
-			"S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"))
+			"U_SMILEY_EDIT" => append_sid("admin_smilies.$phpEx?mode=edit&amp;id=" . $smilies[$i]['smilies_id']), 
+			"U_SMILEY_DELETE" => append_sid("admin_smilies.$phpEx?mode=delete&amp;id=" . $smilies[$i]['smilies_id']))
 		);
+	}
 
-		//
-		// Loop throuh the rows of smilies setting block vars for the template.
-		//
-		for($i = 0; $i < count($smilies); $i++)
-		{
-			$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
-			$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
-
-			$template->assign_block_vars("smiles", array(
-				"ROW_COLOR" => "#" . $row_color,
-				"ROW_CLASS" => $row_class,
-
-				"SMILEY_IMG" =>  $phpbb_root_path . $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'], 
-				"CODE" => $smilies[$i]['code'],
-				"EMOT" => $smilies[$i]['emoticon'],
-				
-				"U_SMILEY_EDIT" => append_sid("admin_smilies.$phpEx?mode=edit&amp;id=" . $smilies[$i]['smilies_id']), 
-				"U_SMILEY_DELETE" => append_sid("admin_smilies.$phpEx?mode=delete&amp;id=" . $smilies[$i]['smilies_id']))
-			);
-		}
-
-		//
-		// Spit out the page.
-		//
-		$template->pparse("body");
-		break;
+	//
+	// Spit out the page.
+	//
+	$template->pparse("body");
 }
 
 //
@@ -536,4 +521,4 @@ switch($mode)
 //
 include('page_footer_admin.'.$phpEx);
 
-?>
+?>
+\ No newline at end of file
diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php
index 11f2d9809d..10b7ef5af4 100644
--- a/phpBB/language/lang_english/lang_admin.php
+++ b/phpBB/language/lang_english/lang_admin.php
@@ -299,36 +299,39 @@ $lang['Forums_updated'] = "Forum and Category information updated successfully";
 
 $lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration";
 
+
 //
 // Smiley Management
 //
-$lang['smiley_return'] = "Return to smiley listing";
-$lang['smiley_del_success'] = "The smiley was successfully removed";
 $lang['smiley_title'] = "Smiles Editing Utility";
+$lang['smile_desc'] = "From this page you can add, remove and edit the emoticons or smileys your users can use in their posts and private messages.";
+
+$lang['smiley_config'] = "Smiley Configuration";
 $lang['smiley_code'] = "Smiley Code";
 $lang['smiley_url'] = "Smiley Image File";
 $lang['smiley_emot'] = "Smiley Emotion";
-$lang['smiley_add_success'] = "The smiley was successfully added";
-$lang['smiley_edit_success'] = "The smiley was successfully updated";
 $lang['smile_add'] = "Add a new Smiley";
-$lang['smile_desc'] = "From this page you can add, remove and edit the emoticons or smileys your users can use in their posts and private messages.";
-$lang['smiley_config'] = "Smiley Configuration";
 $lang['Smile'] = "Smile";
 $lang['Emotion'] = "Emotion";
-$lang['Select_pak'] = "Select Pak File";
+
+$lang['Select_pak'] = "Select Pack (.pak) File";
 $lang['replace_existing'] = "Replace Existing Smiley";
 $lang['keep_existing'] = "Keep Existing Smiley";
-$lang['smiley_import_inst'] = "You should unzip the smiley package and upload all files to the proper Smiley directory for your installation.  Then select the correct information in this form to import the smiley pack.";
+$lang['smiley_import_inst'] = "You should unzip the smiley package and upload all files to the appropriate Smiley directory for your installation.  Then select the correct information in this form to import the smiley pack.";
 $lang['smiley_import'] = "Smiley Pack Import";
-$lang['choose_smile_pak'] = "Choose the correct Smile Pack .pak file";
+$lang['choose_smile_pak'] = "Choose a Smile Pack .pak file";
 $lang['import'] = "Import Smileys";
 $lang['smile_conflicts'] = "What should be done in case of conflicts";
-$lang['del_existing_smileys'] = "Delete all existing smileys before import";
+$lang['del_existing_smileys'] = "Delete existing smileys before import";
 $lang['import_smile_pack'] = "Import Smiley Pack";
 $lang['export_smile_pack'] = "Create Smiley Pack";
-$lang['export_smiles'] = "To create a smiley pack from your currently installed smileys, <a href='admin_smilies.php?mode=export&send_file=1'>Click Here</a> to download the smiles.pak file.  Name this file appropriately making sure to keep the .pak file extension.  Then create a zip file containing all of your smiley images plus this .pak configuration file.";
-$lang['smiley_import_success'] = "The smiley pack was imported successfully!";
+$lang['export_smiles'] = "To create a smiley pack from your currently installed smileys, click %sHere%s to download the smiles.pak file. Name this file appropriately making sure to keep the .pak file extension.  Then create a zip file containing all of your smiley images plus this .pak configuration file.";
 
+$lang['smiley_add_success'] = "The Smiley was successfully added";
+$lang['smiley_edit_success'] = "The Smiley was successfully updated";
+$lang['smiley_import_success'] = "The Smiley Pack was imported successfully!";
+$lang['smiley_del_success'] = "The Smiley was successfully removed";
+$lang['Click_return_smileadmin'] = "Click %sHere%s to return to Smiley Administration";
 
 //
 // User Management
diff --git a/phpBB/templates/subSilver/admin/smile_import_body.tpl b/phpBB/templates/subSilver/admin/smile_import_body.tpl
index c822216294..9881cb1ca7 100644
--- a/phpBB/templates/subSilver/admin/smile_import_body.tpl
+++ b/phpBB/templates/subSilver/admin/smile_import_body.tpl
@@ -12,14 +12,13 @@
 		<td class="row2">{S_SMILE_SELECT}</td>
 	</tr>
 	<tr>
-		<td class="row1">{L_CONFLICTS}</td>
-		<td class="row1">{S_REPLACE_OPT}<br>{S_KEEP_OPT}</td>
+		<td class="row1">{L_DEL_EXISTING}</td>
+		<td class="row1"><input type="checkbox" name="clear_current" value="1" /></td>
 	</tr>
 	<tr>
-		<td class="row2">{L_DEL_EXISTING}</td>
-		<td class="row2">{S_DEL_EXISTING}</td>
+		<td class="row2" colspan="2" align="center">{L_CONFLICTS}<br /><input type="radio" name="replace" value="1" checked="checked"/> {L_REPLACE_EXISTING} &nbsp; <input type="radio" name="replace" value="0" /> {L_KEEP_EXISTING}</td>
 	</tr>
 	<tr>
-		<td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="mainoption" type="submit" value="{L_IMPORT}" /></td>
+		<td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="mainoption" name="import_pack" type="submit" value="{L_IMPORT}" /></td>
 	</tr>
 </table></form>
diff --git a/phpBB/templates/subSilver/admin/smile_list_body.tpl b/phpBB/templates/subSilver/admin/smile_list_body.tpl
index ba8b6e2703..ce63bc83c0 100644
--- a/phpBB/templates/subSilver/admin/smile_list_body.tpl
+++ b/phpBB/templates/subSilver/admin/smile_list_body.tpl
@@ -20,6 +20,6 @@
 	</tr>
 	<!-- END smiles -->
 	<tr>
-		<td class="catBottom" colspan="5" align="center">{S_HIDDEN_FIELDS}<input type="submit" value="{L_SMILEY_ADD}" class="mainoption" />{S_IMPORT}{S_EXPORT}
+		<td class="catBottom" colspan="5" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="add" value="{L_SMILEY_ADD}" class="mainoption" />&nbsp;&nbsp;<input class="liteoption" type="submit" name="import_pack" value="{L_IMPORT_PACK}">&nbsp;&nbsp;<input class="liteoption" type="submit" name="export_pack" value="{L_EXPORT_PACK}"></td>
 	</tr>
 </table></form>