From 318e561cb2a2698aed9fc2fff34e648deebb0676 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 19 Nov 2005 16:16:52 +0000
Subject: - use acl_m_ instead of acl_m - some reference fixes

git-svn-id: file:///svn/phpbb/trunk@5307 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions_upload.php | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/functions_upload.php')

diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index 56fb295d59..a3109c0ef4 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -62,7 +62,7 @@ class filespec
 			$this->mimetype = 'application/octetstream';
 		}
 		
-		$this->extension = array_pop(explode('.', strtolower($this->realname)));
+		$this->extension = strtolower($this->get_extension($this->realname));
 
 		// Try to get real filesize from temporary folder (not always working) ;)
 		$this->filesize = (@filesize($this->filename)) ? @filesize($this->filename) : $this->filesize;
@@ -144,6 +144,20 @@ class filespec
 		}
 	}
 
+	/**
+	* Get file extension
+	*/
+	function get_extension($filename)
+	{
+		if (strpos($filename, '.') === false)
+		{
+			return '';
+		}
+
+		$filename = explode('.', $filename);
+		return array_pop($filename);
+	}
+
 	/**
 	* Move file to destination folder
 	* 
@@ -508,7 +522,11 @@ class fileupload
 		$port = (!empty($url['port'])) ? (int) $url['port'] : 80;
 			
 		$upload_ary['type'] = 'application/octet-stream';
-		$upload_ary['name'] = basename($url['path']) . '.' . array_pop(explode('.', $url['path']));
+		
+		$url['path'] = explode('.', $url['path']);
+		$ext = array_pop($url['path']);
+		
+		$upload_ary['name'] = basename($url['path']) . (($ext) ? '.' . $ext : '');
 		$filename = $url['path'];
 		$filesize = 0;
 
-- 
cgit v1.2.1