1 files changed, 66 insertions, 10 deletions

diff --git a/engine/classes/ElggFile.php b/engine/classes/ElggFile.php
index a6ed44a68..23080834b 100644
--- a/engine/classes/ElggFile.php
+++ b/engine/classes/ElggFile.php
@@ -93,6 +93,7 @@ class ElggFile extends ElggObject {
 			$container_guid = $this->container_guid;
 		}
 		$fs = $this->getFilestore();
+		// @todo add getSize() to ElggFilestore
 		return $fs->getSize($prefix, $container_guid);
 	}
 
@@ -121,6 +122,49 @@ class ElggFile extends ElggObject {
 	}
 
 	/**
+	 * Detects mime types based on filename or actual file.
+	 *
+	 * @param mixed $file    The full path of the file to check. For uploaded files, use tmp_name.
+	 * @param mixed $default A default. Useful to pass what the browser thinks it is.
+	 * @since 1.7.12
+	 *
+	 * @note If $file is provided, this may be called statically
+	 *
+	 * @return mixed Detected type on success, false on failure.
+	 */
+	public function detectMimeType($file = null, $default = null) {
+		if (!$file) {
+			if (isset($this) && $this->filename) {
+				$file = $this->filename;
+			} else {
+				return false;
+			}
+		}
+
+		$mime = false;
+
+		// for PHP5 folks.
+		if (function_exists('finfo_file') && defined('FILEINFO_MIME_TYPE')) {
+			$resource = finfo_open(FILEINFO_MIME_TYPE);
+			if ($resource) {
+				$mime = finfo_file($resource, $file);
+			}
+		}
+
+		// for everyone else.
+		if (!$mime && function_exists('mime_content_type')) {
+			$mime = mime_content_type($file);
+		}
+
+		// default
+		if (!$mime) {
+			return $default;
+		}
+
+		return $mime;
+	}
+
+	/**
 	 * Set the optional file description.
 	 *
 	 * @param string $description The description.
@@ -137,6 +181,8 @@ class ElggFile extends ElggObject {
 	 * @param string $mode Either read/write/append
 	 *
 	 * @return resource File handler
+	 *
+	 * @throws IOException|InvalidParameterException
 	 */
 	public function open($mode) {
 		if (!$this->getFilename()) {
@@ -229,9 +275,14 @@ class ElggFile extends ElggObject {
 	 */
 	public function delete() {
 		$fs = $this->getFilestore();
-		if ($fs->delete($this)) {
-			return parent::delete();
+		
+		$result = $fs->delete($this);
+		
+		if ($this->getGUID() && $result) {
+			$result = parent::delete();
 		}
+		
+		return $result;
 	}
 
 	/**
@@ -244,6 +295,7 @@ class ElggFile extends ElggObject {
 	public function seek($position) {
 		$fs = $this->getFilestore();
 
+		// @todo add seek() to ElggFilestore
 		return $fs->seek($this->handle, $position);
 	}
 
@@ -302,10 +354,12 @@ class ElggFile extends ElggObject {
 
 	/**
 	 * Return a filestore suitable for saving this file.
-	 * This filestore is either a pre-registered filestore, a filestore loaded from metatags saved
-	 * along side this file, or the system default.
+	 * This filestore is either a pre-registered filestore,
+	 * a filestore as recorded in metadata or the system default.
 	 *
 	 * @return ElggFilestore
+	 *
+	 * @throws ClassNotFoundException
 	 */
 	protected function getFilestore() {
 		// Short circuit if already set.
@@ -318,12 +372,11 @@ class ElggFile extends ElggObject {
 		// need to get all filestore::* metadata because the rest are "parameters" that
 		// get passed to filestore::setParameters()
 		if ($this->guid) {
-			$db_prefix = elgg_get_config('dbprefix');
 			$options = array(
 				'guid' => $this->guid,
 				'where' => array("n.string LIKE 'filestore::%'"),
 			);
-			
+
 			$mds = elgg_get_metadata($options);
 
 			$parameters = array();
@@ -334,20 +387,23 @@ class ElggFile extends ElggObject {
 				}
 				$parameters[$name] = $md->value;
 			}
+		}
 
+		// need to check if filestore is set because this entity is loaded in save()
+		// before the filestore metadata is saved.
+		if (isset($filestore)) {
 			if (!class_exists($filestore)) {
 				$msg = elgg_echo('ClassNotFoundException:NotFoundNotSavedWithFile',
-								array($filestore,
-								$this->guid));
+					array($filestore, $this->guid));
 				throw new ClassNotFoundException($msg);
 			}
 
 			$this->filestore = new $filestore();
 			$this->filestore->setParameters($parameters);
+			// @todo explain why $parameters will always be set here (PhpStorm complains)
 		}
 
-		// sometimes it doesn't get saved in the metadata.
-		// fallback to default...
+		// this means the entity hasn't been saved so fallback to default
 		if (!$this->filestore) {
 			$this->filestore = get_default_filestore();
 		}