2 files changed, 47 insertions, 5 deletions
diff --git a/phpBB/admin/admin_smilies.php b/phpBB/admin/admin_smilies.php
index 2f71d143b7..769e9ce315 100644
--- a/phpBB/admin/admin_smilies.php
+++ b/phpBB/admin/admin_smilies.php
@@ -34,6 +34,17 @@ require('pagestart.inc');
 // Check to see what mode we should operate in.
 //
 $mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
+//
+// Read a listing of uploaded smilies for use in the add or edit smliey code...
+//
+$dir = opendir($phpbb_root_path . $board_config['smilies_path']);
+while($file = readdir($dir))
+{
+	if($file != '.' && $file != '..')
+	{
+		$smiley_images[] = $file;
+	}
+}
 switch($mode)
 {
 	//
@@ -98,8 +109,18 @@ switch($mode)
 			"SMILEY_ID_VAL" => $smile_data['smilies_id'],
 			"SMILEY_URL_VAL" => $smile_data['smile_url'],
 			"SMILEY_EMOTION" => $smile_data['emoticon'],
-			"S_HIDDEN_VAR" => "save")
+			"S_HIDDEN_VAR" => "save",
+			"S_SMILEY_BASEDIR" => $phpbb_root_path . '/' . $board_config['smilies_path'])
 		);
+		for( $i = 0; $i < count($smiley_images); $i++ )
+		{
+			$smiley_selected = ($smiley_images[$i] == $smile_data['smile_url']) ? "SELECTED" : "";
+			$template->assign_block_vars("smile_images", array(
+				"FILENAME" => $smiley_images[$i], 
+				"SELECTED" => $smiley_selected)
+			);
+		}
+
 		//
 		// Spit out the edit form.
 		//
@@ -120,10 +141,19 @@ switch($mode)
 			"L_SMILEY_CODE_LBL" => $lang['smiley_code'],
 			"L_SMILEY_URL_LBL" => $lang['smiley_url'],
 			"L_SMILEY_EMOTION_LBL" => $lang['smiley_emot'],
+			"SMILEY_URL_VAL" => $smiley_images[0],
 			"L_SUBMIT" => $lang['Submit_changes'],
 			"L_RESET" => $lang['Reset_changes'],
-			"S_HIDDEN_VAR" => "savenew")
+			"S_HIDDEN_VAR" => "savenew",
+			"S_SMILEY_BASEDIR" => $phpbb_root_path . '/' . $board_config['smilies_path'])
 		);
+		for( $i = 0; $i < count($smiley_images); $i++ )
+		{
+			$template->assign_block_vars("smile_images", array(
+				"FILENAME" => $smiley_images[$i])
+			);
+		}
+
 		//
 		// Spit out the add form.
 		//
@@ -268,4 +298,4 @@ switch($mode)
 //
 include('page_footer_admin.'.$phpEx);
 
-?>
-\ No newline at end of file
+?>
diff --git a/phpBB/templates/PSO/admin/smile_edit.tpl b/phpBB/templates/PSO/admin/smile_edit.tpl
index b1dfe0feff..0b15de9de2 100644
--- a/phpBB/templates/PSO/admin/smile_edit.tpl
+++ b/phpBB/templates/PSO/admin/smile_edit.tpl
@@ -4,7 +4,14 @@
 <h1>{L_SMILEY_TITLE}</h1>
 
 <P>{L_SMILEY_INSTR}</p>
-
+<script language="javascript">
+<!--
+function update_smiley(newimage)
+{
+	document.smiley_image.src = '{S_SMILEY_BASEDIR}/' + newimage;
+}
+-->
+</script>
 <form method="post" action="{S_SMILEY_ACTION}">
 <input type="hidden" name="mode" value="{S_HIDDEN_VAR}">
 <input type="hidden" name="id" value="{SMILEY_ID_VAL}">
@@ -18,7 +25,12 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_SMILEY_URL_LBL}</td>
-		<td class="row1"><input type="text" name="url" value="{SMILEY_URL_VAL}" /></td>
+		<td class="row1"><select name="url" onchange="update_smiley(this.options[selectedIndex].value);">
+			<!-- BEGIN smile_images -->
+			<option value="{smile_images.FILENAME}" {smile_images.SELECTED}>{smile_images.FILENAME}</option>
+			<!-- END smile_images -->
+			</select>
+			<img name='smiley_image' src="{S_SMILEY_BASEDIR}/{SMILEY_URL_VAL}" border=0 alt="smiley"></td>
 	</tr>
 	<tr>
 		<td class="row2">{L_SMILEY_EMOTION_LBL}</td>