From bed04a12305bb50872fc38ef7b2574364c48de00 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sat, 30 Jul 2016 23:02:14 +0100
Subject: [PATCH] assert that metadata['tags'] is an array

---
 ext/handle_flash/main.php | 2 +-
 ext/handle_ico/main.php   | 2 +-
 ext/handle_mp3/main.php   | 2 +-
 ext/handle_pixel/main.php | 8 ++++----
 ext/handle_svg/main.php   | 2 +-
 ext/handle_video/main.php | 2 +-
 ext/upload/main.php       | 6 +++++-
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ext/handle_flash/main.php b/ext/handle_flash/main.php
index 9b8eda6c..6122cb46 100644
--- a/ext/handle_flash/main.php
+++ b/ext/handle_flash/main.php
@@ -37,7 +37,7 @@ class FlashFileHandler extends DataHandlerExtension {
 		$image->hash	  = $metadata['hash'];
 		$image->filename  = $metadata['filename'];
 		$image->ext       = $metadata['extension'];
-		$image->tag_array = Tag::explode($metadata['tags']);
+		$image->tag_array = $metadata['tags'];
 		$image->source    = $metadata['source'];
 
 		$info = getimagesize($filename);
diff --git a/ext/handle_ico/main.php b/ext/handle_ico/main.php
index e9d90227..83cd9d56 100644
--- a/ext/handle_ico/main.php
+++ b/ext/handle_ico/main.php
@@ -79,7 +79,7 @@ class IcoFileHandler extends Extension {
 		$image->hash      = $metadata['hash'];
 		$image->filename  = $metadata['filename'];
 		$image->ext       = $metadata['extension'];
-		$image->tag_array = Tag::explode($metadata['tags']);
+		$image->tag_array = $metadata['tags'];
 		$image->source    = $metadata['source'];
 
 		return $image;
diff --git a/ext/handle_mp3/main.php b/ext/handle_mp3/main.php
index 069107b5..3ccd2871 100644
--- a/ext/handle_mp3/main.php
+++ b/ext/handle_mp3/main.php
@@ -55,7 +55,7 @@ class MP3FileHandler extends DataHandlerExtension {
 		}
 		
 		$image->ext       = $metadata['extension'];
-		$image->tag_array = Tag::explode($metadata['tags']);
+		$image->tag_array = $metadata['tags'];
 		$image->source    = $metadata['source'];
 
 		return $image;
diff --git a/ext/handle_pixel/main.php b/ext/handle_pixel/main.php
index e216568a..38ba6b3d 100644
--- a/ext/handle_pixel/main.php
+++ b/ext/handle_pixel/main.php
@@ -32,11 +32,11 @@ class PixelFileHandler extends DataHandlerExtension {
 		$image->height = $info[1];
 
 		$image->filesize  = $metadata['size'];
-		$image->hash	  = $metadata['hash'];
+		$image->hash      = $metadata['hash'];
 		$image->filename  = (($pos = strpos($metadata['filename'],'?')) !== false) ? substr($metadata['filename'],0,$pos) : $metadata['filename'];
-		$image->ext	   = (($pos = strpos($metadata['extension'],'?')) !== false) ? substr($metadata['extension'],0,$pos) : $metadata['extension'];
-		$image->tag_array = Tag::explode($metadata['tags']);
-		$image->source	= $metadata['source'];
+		$image->ext       = (($pos = strpos($metadata['extension'],'?')) !== false) ? substr($metadata['extension'],0,$pos) : $metadata['extension'];
+		$image->tag_array = $metadata['tags'];
+		$image->source    = $metadata['source'];
 
 		return $image;
 	}
diff --git a/ext/handle_svg/main.php b/ext/handle_svg/main.php
index e412500b..872d59d4 100644
--- a/ext/handle_svg/main.php
+++ b/ext/handle_svg/main.php
@@ -75,7 +75,7 @@ class SVGFileHandler extends Extension {
 		$image->hash      = $metadata['hash'];
 		$image->filename  = $metadata['filename'];
 		$image->ext       = $metadata['extension'];
-		$image->tag_array = Tag::explode($metadata['tags']);
+		$image->tag_array = $metadata['tags'];
 		$image->source    = $metadata['source'];
 
 		return $image;
diff --git a/ext/handle_video/main.php b/ext/handle_video/main.php
index c256b3f2..65471165 100644
--- a/ext/handle_video/main.php
+++ b/ext/handle_video/main.php
@@ -169,7 +169,7 @@ class VideoFileHandler extends DataHandlerExtension {
 		$image->filesize  = $metadata['size'];
 		$image->hash      = $metadata['hash'];
 		$image->filename  = $metadata['filename'];
-		$image->tag_array = Tag::explode($metadata['tags']);
+		$image->tag_array = $metadata['tags'];
 		$image->source    = $metadata['source'];
 
 		return $image;
diff --git a/ext/upload/main.php b/ext/upload/main.php
index 6f632124..5232896b 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -29,7 +29,11 @@ class DataUploadEvent extends Event {
 	 * @param array $metadata Info about the file, should contain at least "filename", "extension", "tags" and "source".
 	 */
 	public function __construct(/*string*/ $tmpname, /*array*/ $metadata) {
-		assert(file_exists($tmpname));
+		assert('file_exists($tmpname)');
+		assert('is_string($metadata["filename"])');
+		assert('is_string($metadata["extension"])');
+		assert('is_array($metadata["tags"])');
+		assert('is_string($metadata["source"]) || is_null($metadata["source"])');
 
 		$this->tmpname = $tmpname;