From 88d986d815ef6930ba458725e0bc41fcc3e1d535 Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Mon, 28 May 2007 15:17:13 +0000
Subject: [PATCH] Bugtracker #3798 - display more user-friendly file name with
 forum uploads

---
 e107_handlers/upload_handler.php  | 8 +++++---
 e107_plugins/forum/forum_post.php | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/e107_handlers/upload_handler.php b/e107_handlers/upload_handler.php
index 6818af62e..5070b317b 100644
--- a/e107_handlers/upload_handler.php
+++ b/e107_handlers/upload_handler.php
@@ -12,9 +12,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |   $Source: /cvs_backup/e107_0.8/e107_handlers/upload_handler.php,v $
-|   $Revision: 1.1.1.1 $
-|   $Date: 2006-12-02 04:33:58 $
-|   $Author: mcfly_e107 $
+|   $Revision: 1.2 $
+|   $Date: 2007-05-28 15:17:07 $
+|   $Author: e107steved $
 +---------------------------------------------------------------+
 */
 
@@ -94,6 +94,7 @@ function file_upload($uploaddir, $avatar = FALSE, $fileinfo = "", $overwrite = "
 		{
 			$filesize[] = $files['size'][$key];
 			$name = preg_replace("/[^a-z0-9._-]/", "", str_replace(" ", "_", str_replace("%20", "_", strtolower($name))));
+			$raw_name = $name;			// Save 'proper' file name - useful for display
 			if ($avatar == "attachment") {
 				$name = time()."_".USERID."_".$fileinfo.$name;
 			}
@@ -130,6 +131,7 @@ function file_upload($uploaddir, $avatar = FALSE, $fileinfo = "", $overwrite = "
 				}
 
 				$uploaded[$c]['name'] = $name;
+				$uploaded[$c]['rawname'] = $raw_name;
 				$uploaded[$c]['type'] = $files['type'][$key];
 				$uploaded[$c]['size'] = 0;
 
diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php
index c17c645b1..ff95183e5 100644
--- a/e107_plugins/forum/forum_post.php
+++ b/e107_plugins/forum/forum_post.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/forum/forum_post.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2007-01-18 20:44:32 $
+|     $Revision: 1.5 $
+|     $Date: 2007-05-28 15:17:13 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -630,7 +630,7 @@ function process_upload()
 				{
 					//upload was not an image, link to file
 					//echo "<pre>"; print_r($upload); echo "</pre>";
-					$_POST['post'] .= "[br][file=".e_FILE."public/".$upload['name']."]".$upload['name']."[/file]";
+					$_POST['post'] .= "[br][file=".e_FILE."public/".$upload['name']."]".(isset($upload['rawname']) ? $upload['rawname'] : $upload['name'])."[/file]";
 				}
 
 			}